junit improvements:

assertEquals(null, ...) -> assertNull(...)
attachment.getAttachFileName().toString() -> attachment.getAttachFileName().getValue()

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1777423 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2017-01-05 07:16:27 +00:00
parent 8cc9352d26
commit a3489c0dbb
1 changed files with 15 additions and 15 deletions

View File

@ -81,17 +81,17 @@ public class TestFileWithAttachmentsRead extends TestCase {
// Now check in detail // Now check in detail
attachment = twoSimpleAttachments.getAttachmentFiles()[0]; attachment = twoSimpleAttachments.getAttachmentFiles()[0];
assertEquals("TEST-U~1.DOC", attachment.getAttachFileName().toString()); assertEquals("TEST-U~1.DOC", attachment.getAttachFileName().getValue());
assertEquals("test-unicode.doc", attachment.getAttachLongFileName().toString()); assertEquals("test-unicode.doc", attachment.getAttachLongFileName().getValue());
assertEquals(".doc", attachment.getAttachExtension().getValue()); assertEquals(".doc", attachment.getAttachExtension().getValue());
assertEquals(null, attachment.getAttachMimeTag()); assertNull(attachment.getAttachMimeTag());
assertEquals(24064, attachment.getAttachData().getValue().length); assertEquals(24064, attachment.getAttachData().getValue().length);
attachment = twoSimpleAttachments.getAttachmentFiles()[1]; attachment = twoSimpleAttachments.getAttachmentFiles()[1];
assertEquals("pj1.txt", attachment.getAttachFileName().toString()); assertEquals("pj1.txt", attachment.getAttachFileName().getValue());
assertEquals("pj1.txt", attachment.getAttachLongFileName().toString()); assertEquals("pj1.txt", attachment.getAttachLongFileName().getValue());
assertEquals(".txt", attachment.getAttachExtension().getValue()); assertEquals(".txt", attachment.getAttachExtension().getValue());
assertEquals(null, attachment.getAttachMimeTag()); assertNull(attachment.getAttachMimeTag());
assertEquals(89, attachment.getAttachData().getValue().length); assertEquals(89, attachment.getAttachData().getValue().length);
} }
@ -106,20 +106,20 @@ public class TestFileWithAttachmentsRead extends TestCase {
// Second is a PDF // Second is a PDF
attachment = pdfMsgAttachments.getAttachmentFiles()[1]; attachment = pdfMsgAttachments.getAttachmentFiles()[1];
assertEquals("smbprn~1.pdf", attachment.getAttachFileName().toString()); assertEquals("smbprn~1.pdf", attachment.getAttachFileName().getValue());
assertEquals("smbprn.00009008.KdcPjl.pdf", attachment.getAttachLongFileName().toString()); assertEquals("smbprn.00009008.KdcPjl.pdf", attachment.getAttachLongFileName().getValue());
assertEquals(".pdf", attachment.getAttachExtension().getValue()); assertEquals(".pdf", attachment.getAttachExtension().getValue());
assertEquals(null, attachment.getAttachMimeTag()); assertNull(attachment.getAttachMimeTag());
assertEquals(null, attachment.getAttachmentDirectory()); assertNull(attachment.getAttachmentDirectory());
assertEquals(13539, attachment.getAttachData().getValue().length); assertEquals(13539, attachment.getAttachData().getValue().length);
// First in a nested message // First in a nested message
attachment = pdfMsgAttachments.getAttachmentFiles()[0]; attachment = pdfMsgAttachments.getAttachmentFiles()[0];
assertEquals("Test Attachment", attachment.getAttachFileName().toString()); assertEquals("Test Attachment", attachment.getAttachFileName().getValue());
assertEquals(null, attachment.getAttachLongFileName()); assertNull(attachment.getAttachLongFileName());
assertEquals(null, attachment.getAttachExtension()); assertNull(attachment.getAttachExtension());
assertEquals(null, attachment.getAttachMimeTag()); assertNull(attachment.getAttachMimeTag());
assertEquals(null, attachment.getAttachData()); assertNull(attachment.getAttachData());
assertNotNull(attachment.getAttachmentDirectory()); assertNotNull(attachment.getAttachmentDirectory());
// Check we can see some bits of it // Check we can see some bits of it