Skip to content

Fix npe for null attachment (fixes #77) #78

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

Merged
eroshenkoam merged 1 commit into from
Jun 8, 2017
Merged

Fix npe for null attachment (fixes #77) #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void attachment(final JoinPoint joinPoint, final Object result) {
);

final byte[] bytes = (result instanceof byte[])
? (byte[]) result : result.toString().getBytes(StandardCharsets.UTF_8);
? (byte[]) result : Objects.toString(result).getBytes(StandardCharsets.UTF_8);
getLifecycle().addAttachment(title, attachment.type(), "", bytes);
}

Expand Down
24 changes: 24 additions & 0 deletions allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,30 @@ public void shouldSetupAttachmentTitleFromMethodSignature() {

}

@Test
public void shouldProcessNullAttachment() throws Exception {
final String uuid = UUID.randomUUID().toString();
final TestResult result = new TestResult().withUuid(uuid);

lifecycle.scheduleTestCase(result);
lifecycle.startTestCase(uuid);

attachmentWithNullValue();

lifecycle.stopTestCase(uuid);
lifecycle.writeTestCase(uuid);

assertThat(results.getTestResults())
.flatExtracting(TestResult::getAttachments)
.extracting("name", "type")
.containsExactly(tuple("attachmentWithNullValue", null));
}

@Attachment
public byte[] attachmentWithNullValue() {
return null;
}

@Attachment
public byte[] attachmentWithoutTitle() {
return new byte[]{};
Expand Down