fix npe for null attachment (fixes allure-framework#77, via allure-framework#78)

baev · Artem Eroshenko · commit a58eed2710f4 · 2017-06-08T18:44:15.000+03:00
diff --git a/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java b/allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1AttachAspects.java
@@ -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);
     }
 
diff --git a/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java b/allure-java-migration/src/test/java/io/qameta/allure/aspects/Allure1AttachAspectsTest.java
@@ -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[]{};

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void attachment(final JoinPoint joinPoint, final Object result) {`
`53`	`53`	`);`
`54`	`54`
`55`	`55`	`final byte[] bytes = (result instanceof byte[])`
`56`		`- ? (byte[]) result : result.toString().getBytes(StandardCharsets.UTF_8);`
	`56`	`+ ? (byte[]) result : Objects.toString(result).getBytes(StandardCharsets.UTF_8);`
`57`	`57`	`getLifecycle().addAttachment(title, attachment.type(), "", bytes);`
`58`	`58`	`}`
`59`	`59`