Return-Path: X-Original-To: apmail-poi-commits-archive@minotaur.apache.org Delivered-To: apmail-poi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E41D5174EE for ; Thu, 23 Apr 2015 18:20:27 +0000 (UTC) Received: (qmail 99223 invoked by uid 500); 23 Apr 2015 18:20:27 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 99186 invoked by uid 500); 23 Apr 2015 18:20:27 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 99177 invoked by uid 99); 23 Apr 2015 18:20:27 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 18:20:27 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id B11E1AC006A for ; Thu, 23 Apr 2015 18:20:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1675698 - /poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java Date: Thu, 23 Apr 2015 18:20:27 -0000 To: commits@poi.apache.org From: nick@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150423182027.B11E1AC006A@hades.apache.org> Author: nick Date: Thu Apr 23 18:20:27 2015 New Revision: 1675698 URL: http://svn.apache.org/r1675698 Log: Make the test generic across POIFS and NPOIFS Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java?rev=1675698&r1=1675697&r2=1675698&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java Thu Apr 23 18:20:27 2015 @@ -34,33 +34,45 @@ public final class TestFileSystemBugs ex public void testNotesOLE2Files() throws Exception { POIDataSamples _samples = POIDataSamples.getPOIFSInstance(); - // Open the file up - POIFSFileSystem fs = new POIFSFileSystem( - _samples.openResourceAsStream("Notes.ole2") - ); + // Open the file up with the two FileSystems + @SuppressWarnings("resource") + DirectoryNode[] roots = new DirectoryNode[] { + new POIFSFileSystem( + _samples.openResourceAsStream("Notes.ole2") + ).getRoot(), + new NPOIFSFileSystem( + _samples.openResourceAsStream("Notes.ole2") + ).getRoot() + }; // Check the contents - assertEquals(1, fs.getRoot().getEntryCount()); + for (DirectoryNode root : roots) { + assertEquals(1, root.getEntryCount()); - Entry entry = fs.getRoot().getEntries().next(); - assertTrue(entry.isDirectoryEntry()); - assertTrue(entry instanceof DirectoryEntry); - - // The directory lacks a name! - DirectoryEntry dir = (DirectoryEntry)entry; - assertEquals("", dir.getName()); - - // Has two children - assertEquals(2, dir.getEntryCount()); - - // Check them - Iterator it = dir.getEntries(); - entry = it.next(); - assertEquals(true, entry.isDocumentEntry()); - assertEquals("\u0001Ole10Native", entry.getName()); - - entry = it.next(); - assertEquals(true, entry.isDocumentEntry()); - assertEquals("\u0001CompObj", entry.getName()); + Entry entry = root.getEntries().next(); + assertTrue(entry.isDirectoryEntry()); + assertTrue(entry instanceof DirectoryEntry); + + // The directory lacks a name! + DirectoryEntry dir = (DirectoryEntry)entry; + assertEquals("", dir.getName()); + + // Has two children + assertEquals(2, dir.getEntryCount()); + + // Check them + Iterator it = dir.getEntries(); + entry = it.next(); + assertEquals(true, entry.isDocumentEntry()); + assertEquals("\u0001Ole10Native", entry.getName()); + + entry = it.next(); + assertEquals(true, entry.isDocumentEntry()); + assertEquals("\u0001CompObj", entry.getName()); + + // Tidy + if (root.getNFileSystem() != null) + root.getNFileSystem().close(); + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org