Skip to content
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

Jump to bottom

Avoid NullPointerException when deserializing TestIdentifier #3820

Merged
merged 3 commits into from
May 16, 2024
Merged

Avoid NullPointerException when deserializing TestIdentifier #3820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4056f66
Fix NPE when deserializing `TestIdentifier`
dmlloyd May 16, 2024
85a300c
Polish test
marcphilipp May 16, 2024
8554cb5
Merge branch 'main' into fix-3819
marcphilipp May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions documentation/src/docs/asciidoc/release-notes/release-notes-5.11.0-M2.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ repository on GitHub.
[[release-notes-5.11.0-M2-junit-platform-bug-fixes]]
==== Bug Fixes

* Fixed a bug where `TestIdentifier` could cause a `NullPointerException` on deserialize when there is no parent identifier. See link:https://github.com/junit-team/junit5/issues/3819[issue 3819].
* ❓

[[release-notes-5.11.0-M2-junit-platform-deprecations-and-breaking-changes]]
Expand Down
6 changes: 4 additions & 2 deletions junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,8 @@ private void readObject(ObjectInputStream s) throws ClassNotFoundException, IOEx
source = serializedForm.source;
tags = serializedForm.tags;
type = serializedForm.type;
parentId = UniqueId.parse(serializedForm.parentId);
String parentId = serializedForm.parentId;
this.parentId = parentId == null ? null : UniqueId.parse(parentId);
legacyReportingName = serializedForm.legacyReportingName;
}

Expand All @@ -307,7 +308,8 @@ private static class SerializedForm implements Serializable {

SerializedForm(TestIdentifier testIdentifier) {
this.uniqueId = testIdentifier.uniqueId.toString();
this.parentId = testIdentifier.parentId.toString();
UniqueId parentId = testIdentifier.parentId;
this.parentId = parentId == null ? null : parentId.toString();
this.displayName = testIdentifier.displayName;
this.legacyReportingName = testIdentifier.legacyReportingName;
this.source = testIdentifier.source;
Expand Down
15 changes: 15 additions & 0 deletions platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,21 @@ void initialVersionCanBeDeserialized() throws Exception {
}
}

@Test
void identifierWithNoParentCanBeSerializedAndDeserialized() throws Exception {
TestIdentifier originalIdentifier = TestIdentifier.from(
new AbstractTestDescriptor(UniqueId.root("example", "id"), "Example") {
@Override
public Type getType() {
return Type.CONTAINER;
}
});

var deserializedIdentifier = (TestIdentifier) deserialize(serialize(originalIdentifier));

assertDeepEquals(originalIdentifier, deserializedIdentifier);
}

private static void assertDeepEquals(TestIdentifier first, TestIdentifier second) {
assertEquals(first, second);
assertEquals(first.getUniqueId(), second.getUniqueId());
Expand Down