svn commit: r1657952 - in /tika/trunk/tika-parsers/src/test: java/org/apache/tika/mime/TestMimeTypes.java java/org/apache/tika/parser/font/FontParsersTest.java resources/test-documents/testTrueType2.ttf resources/test-documents/testTrueType3.ttf

[tallison]

Author: tallison
Date: Fri Feb  6 20:33:02 2015
New Revision: 1657952

URL: http://svn.apache.org/r1657952
Log:
TIKA-1542 substitute Apache friendly TTF test file for our current copyrighted 
file, take 2.  See PDFBOX-2383

Added:
    tika/trunk/tika-parsers/src/test/resources/test-documents/testTrueType3.ttf 
  (with props)
Removed:
    tika/trunk/tika-parsers/src/test/resources/test-documents/testTrueType2.ttf
Modified:
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java?rev=1657952&r1=1657951&r2=1657952&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java 
(original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java 
Fri Feb  6 20:33:02 2015
@@ -704,7 +704,7 @@ public class TestMimeTypes {
         assertType("audio/x-wav", "testWAV.wav");
         assertType("audio/midi", "testMID.mid");
         assertType("application/x-msaccess", "testACCESS.mdb");
-        assertType("application/x-font-ttf", "testTrueType2.ttf");
+        assertType("application/x-font-ttf", "testTrueType3.ttf");
     }
     
     @Test

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java?rev=1657952&r1=1657951&r2=1657952&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
 Fri Feb  6 20:33:02 2015
@@ -81,9 +81,12 @@ public class FontParsersTest {
         ContentHandler handler = new BodyContentHandler();
         Metadata metadata = new Metadata();
         ParseContext context = new ParseContext();
+        //Open Sans font is ASL 2.0 according to 
+        //http://www.google.com/fonts/specimen/Open+Sans
+        //...despite the copyright in the file's metadata.
         TikaInputStream stream = TikaInputStream.get(
                 FontParsersTest.class.getResource(
-                        "/test-documents/testTrueType2.ttf"));
+                        "/test-documents/testTrueType3.ttf"));
         
         try {
             parser.parse(stream, handler, metadata, context);
@@ -92,20 +95,19 @@ public class FontParsersTest {
         }
 
         assertEquals("application/x-font-ttf", 
metadata.get(Metadata.CONTENT_TYPE));
-        assertEquals("Aclonica", metadata.get(TikaCoreProperties.TITLE));
+        assertEquals("Open Sans Bold", metadata.get(TikaCoreProperties.TITLE));
 
-        assertEquals("2011-04-21T07:59:00Z",   
metadata.get(Metadata.CREATION_DATE));
-        assertEquals("2011-04-21T07:59:00Z",   
metadata.get(TikaCoreProperties.CREATED));
-        assertEquals("2011-04-22T19:56:14Z",   
metadata.get(TikaCoreProperties.MODIFIED));
+        assertEquals("2010-12-30T11:04:00Z", 
metadata.get(Metadata.CREATION_DATE));
+        assertEquals("2010-12-30T11:04:00Z", 
metadata.get(TikaCoreProperties.CREATED));
+        assertEquals("2011-05-05T12:37:53Z", 
metadata.get(TikaCoreProperties.MODIFIED));
         
-        assertEquals("Aclonica", metadata.get(MET_FONT_NAME));
-        assertEquals("Aclonica",         metadata.get(MET_FONT_FAMILY_NAME));
-        assertEquals("Regular",                
metadata.get(MET_FONT_SUB_FAMILY_NAME));
-        assertEquals("Aclonica-Regular", metadata.get(MET_PS_NAME));
+        assertEquals("Open Sans Bold", metadata.get(MET_FONT_NAME));
+        assertEquals("Open Sans", metadata.get(MET_FONT_FAMILY_NAME));
+        assertEquals("Bold", metadata.get(MET_FONT_SUB_FAMILY_NAME));
+        assertEquals("OpenSans-Bold", metadata.get(MET_PS_NAME));
         
-        assertEquals("Copyright",           
metadata.get("Copyright").substring(0, 9));
-        assertContains("http://www.apache.org/licenses/LICENSE-2.0.html";, 
metadata.get("Copyright"));
-        assertEquals("Aclonica is a trade", 
metadata.get("Trademark").substring(0, 19));
+        assertEquals("Digitized", metadata.get("Copyright").substring(0, 9));
+        assertEquals("Open Sans", metadata.get("Trademark").substring(0, 9));
         
         // Not extracted
         assertEquals(null, metadata.get(MET_FONT_FULL_NAME));

Added: 
tika/trunk/tika-parsers/src/test/resources/test-documents/testTrueType3.ttf
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/testTrueType3.ttf?rev=1657952&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
tika/trunk/tika-parsers/src/test/resources/test-documents/testTrueType3.ttf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream