From commits-return-11835-archive-asf-public=cust-asf.ponee.io@poi.apache.org Sun Nov 25 21:50:16 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id E84D3180674 for ; Sun, 25 Nov 2018 21:50:15 +0100 (CET) Received: (qmail 27883 invoked by uid 500); 25 Nov 2018 20:50:15 -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 27874 invoked by uid 99); 25 Nov 2018 20:50:15 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Nov 2018 20:50:15 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 66B623A0101 for ; Sun, 25 Nov 2018 20:50:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1847429 - in /poi: site/src/documentation/content/xdocs/changes.xml trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java Date: Sun, 25 Nov 2018 20:50:13 -0000 To: commits@poi.apache.org From: kiwiwings@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181125205014.66B623A0101@svn01-us-west.apache.org> Author: kiwiwings Date: Sun Nov 25 20:50:13 2018 New Revision: 1847429 URL: http://svn.apache.org/viewvc?rev=1847429&view=rev Log: #62951 - FileMagic not correctly identified Modified: poi/site/src/documentation/content/xdocs/changes.xml poi/trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java Modified: poi/site/src/documentation/content/xdocs/changes.xml URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/changes.xml?rev=1847429&r1=1847428&r2=1847429&view=diff ============================================================================== --- poi/site/src/documentation/content/xdocs/changes.xml (original) +++ poi/site/src/documentation/content/xdocs/changes.xml Sun Nov 25 20:50:13 2018 @@ -92,6 +92,7 @@ Upgrade to XMLBeans 3.0.2 + FileMagic not correctly identified SlideShow rendering - keyframe fractions must be increasing Provide OOXMLLite alternative for Java 12+ Handle off-spec, variant REFERENCE_NAME record structure in VBAMacroReader Modified: poi/trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java?rev=1847429&r1=1847428&r2=1847429&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java (original) +++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java Sun Nov 25 20:50:13 2018 @@ -78,7 +78,7 @@ public enum FileMagic { /** PDF document */ PDF("%PDF"), /** Some different HTML documents */ - HTML(" Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java?rev=1847429&r1=1847428&r2=1847429&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java Sun Nov 25 20:50:13 2018 @@ -17,6 +17,7 @@ package org.apache.poi.poifs.filesystem; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -278,4 +279,18 @@ public final class TestPOIFSFileSystem { private static InputStream openSampleStream(String sampleFileName) { return HSSFTestDataSamples.openSampleFileStream(sampleFileName); } + + @Test + public void fileMagics() { + for (FileMagic fm : FileMagic.values()) { + if (fm == FileMagic.UNKNOWN) { + continue; + } + for (byte[] b : fm.magic) { + assertEquals(fm, FileMagic.valueOf(b)); + } + } + + assertEquals(FileMagic.UNKNOWN, FileMagic.valueOf("foobaa".getBytes(UTF_8))); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org