8381882: Convert test/jaxp/javax/xml/jaxp/unittest/stream tests to JUnit by david-beaumont · Pull Request #30643 · openjdk/jdk

david-beaumont · 2026-04-09T07:57:43Z

Convert and tidy-up unit tests in test/jaxp/javax/xml/jaxp/unittest/stream.

It is recommended to set the diff settings in github to hide whitespace (cog-wheel menu).

There are a lot of cases where manual catch blocks with explicit fail are removed to just allow the test to fail idiomatically by throwing the exception normally. This causes thousands of lines to be un-indented (with no other change).

About 200 explicit uses of fail() were either removed or converted to appropriate JUnit asserts.

There are also several non-trivial changes in this PR related to bad tests where, for example, catching and ignoring exceptions allowed the test to pass under all situations.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8381882: Convert test/jaxp/javax/xml/jaxp/unittest/stream tests to JUnit (Sub-task - P4)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/30643/head:pull/30643
$ git checkout pull/30643

Update a local copy of the PR:
$ git checkout pull/30643
$ git pull https://git.openjdk.org/jdk.git pull/30643/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 30643

View PR using the GUI difftool:
$ git pr show -t 30643

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/30643.diff

Using Webrev

Link to Webrev Comment

bridgekeeper · 2026-04-09T07:59:40Z

👋 Welcome back dbeaumont! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2026-04-09T07:59:44Z

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

openjdk · 2026-04-09T08:00:38Z

@david-beaumont The following label will be automatically applied to this pull request:

core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

david-beaumont

Some "preloaded" comments explaining non-trivial changes.

david-beaumont · 2026-04-09T08:04:25Z

test/jaxp/javax/xml/jaxp/unittest/stream/Bug6489502.java

-            Assert.assertEquals(s1.getEventType(), XMLStreamConstants.START_DOCUMENT);
-            s1.next();
-            s1.next(); // advance to <TITLE>
-            Assert.assertTrue(s1.getLocalName().equals("TITLE"));


A lot of assertions have been rewritten to be idiomatic. Mostly this is handled via IntelliJ analysis, but not always.

david-beaumont · 2026-04-09T08:05:58Z

test/jaxp/javax/xml/jaxp/unittest/stream/Bug6509774.java

 public class Bug6509774 {

    @Test
-    public void test0() {


This test was obviously cut & pasted with alternating blank lines (making it much less readable), so I reformatted it to remove unwanted empty lines.

david-beaumont · 2026-04-09T08:06:24Z

test/jaxp/javax/xml/jaxp/unittest/stream/Bug6688002Test.java

        }
    }

-    public static/* synchronized */XMLStreamReader getReader(InputStream is) throws Exception {


No need for synchronization on factories.

david-beaumont · 2026-04-09T08:09:33Z

test/jaxp/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java

 */
 public class CoalesceTest {

-    String countryElementContent = "START India  CS}}}}}} India END";


As well as making these constants, I could switch to UPPER_SNAKE_CASE. Your (reviewer) call.

david-beaumont · 2026-04-09T08:10:20Z

test/jaxp/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java

-                    eventType = streamReader.next();
-                    if (eventType == XMLStreamConstants.CHARACTERS) {
-                        String text = streamReader.getText();
-                        if (!text.equals(descriptionElementContent)) {


None of the debug output is needed if assertEquals() is used.

david-beaumont · 2026-04-09T09:04:48Z

test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java

    public void testDuplicateNamespaceURI() throws Exception {

        xmlStreamWriter.writeStartDocument();
-        xmlStreamWriter.writeStartElement(new String(""), "localName", new String("nsUri"));


It's not clear why the new String() was being used here. I could revert it if it's felt likely to be important.

david-beaumont · 2026-04-09T09:06:19Z

test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java

 public class NamespaceTest {
-
-    /** debug output? */
-    private static final boolean DEBUG = true;


Debug output is extensive and unnecessary for unit tests. I've checked that no output was also affecting the test itself.

david-beaumont · 2026-04-09T09:07:07Z

test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java

-        }
-
-        Assert.assertTrue(actualOutput.equals(EXPECTED_OUTPUT) || actualOutput.equals(EXPECTED_OUTPUT_2), "Expected: " + EXPECTED_OUTPUT + "\n" + "Actual: "
+        assertTrue(actualOutput.equals(EXPECTED_OUTPUT) || actualOutput.equals(EXPECTED_OUTPUT_2), "Expected: " + EXPECTED_OUTPUT + "\n" + "Actual: "


I've left this in, but realistically only one or these sub-clauses will ever be true.

david-beaumont · 2026-04-09T09:10:43Z

test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java

A lot of removal of redundant catch clauses in this test... sorry!

david-beaumont · 2026-04-09T09:11:39Z

test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java

        XMLStreamWriter w = xof.createXMLStreamWriter(sw);
        w.writeStartDocument();
        w.writeStartElement("foo", "bar", "zot");
-        w.writeDefaultNamespace(null);


Not actually asserting anything.

mlbridge · 2026-04-09T09:56:41Z

Webrevs

01: Full - Incremental (9f54aaa6)
00: Full (5f6ef34c)

Convert to JUnit

3937114

openjdk bot added the core-libs core-libs-dev@openjdk.org label Apr 9, 2026

pre-review tidying

5f6ef34

david-beaumont commented Apr 9, 2026

View reviewed changes

david-beaumont marked this pull request as ready for review April 9, 2026 09:51

openjdk bot added the rfr Pull request is ready for review label Apr 9, 2026

one more assertion simplification

9f54aaa

Conversation

david-beaumont commented Apr 9, 2026 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewing

Uh oh!

bridgekeeper bot commented Apr 9, 2026

Uh oh!

openjdk bot commented Apr 9, 2026

Uh oh!

openjdk bot commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

david-beaumont left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mlbridge bot commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

1 participant

david-beaumont commented Apr 9, 2026 •

edited by openjdk bot

Loading

openjdk bot commented Apr 9, 2026 •

edited

Loading

mlbridge bot commented Apr 9, 2026 •

edited

Loading