svn commit: r1681664 - /tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaParsersTest.java

[mattmann]

Author: mattmann
Date: Mon May 25 23:00:42 2015
New Revision: 1681664

URL: http://svn.apache.org/r1681664
Log:
- fix unit tests associated with TIKA-1638

Modified:
    
tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaParsersTest.java

Modified: 
tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaParsersTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaParsersTest.java?rev=1681664&r1=1681663&r2=1681664&view=diff
==============================================================================
--- 
tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaParsersTest.java
 (original)
+++ 
tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaParsersTest.java
 Mon May 25 23:00:42 2015
@@ -141,22 +141,25 @@ public class TikaParsersTest extends CXF
             assertEquals("org.apache.tika.parser.DefaultParser", 
json.get("name"));
             assertEquals(Boolean.TRUE, json.get("composite"));
 
-            // At least 20 child parsers which aren't composite
+            // At least 20 child parsers which aren't composite, except for 
CompositeExternalParser
             Object[] children = (Object[]) (Object) json.get("children");
             assertTrue(children.length >= 20);
             boolean hasOpus = false, hasOOXML = false, hasPDF = false, hasZip 
= false;
             int nonComposite = 0;
+            int composite = 0;
             for (Object o : children) {
                 Map<String, Object> d = (Map<String, Object>) o;
                 assertEquals(true, d.containsKey("name"));
                 assertEquals(true, d.containsKey("composite"));
-                assertEquals(Boolean.FALSE, d.get("composite"));
-                assertEquals(false, d.containsKey("children"));
-
-                if (d.get("composite") == Boolean.FALSE) nonComposite++;
 
+                if (d.get("composite") == Boolean.FALSE)
+                       nonComposite++;
+                else
+                       composite++;
+                
                 // Will only have mime types if requested
-                assertEquals(details, d.containsKey("supportedTypes"));
+                if (d.get("composite") == Boolean.FALSE)
+                       assertEquals(details, d.containsKey("supportedTypes"));
 
                 String name = (String) d.get("name");
                 if (OpusParser.class.getName().equals(name)) {
@@ -177,6 +180,7 @@ public class TikaParsersTest extends CXF
             assertEquals(true, hasPDF);
             assertEquals(true, hasZip);
             assertTrue(nonComposite > 20);
+            assertEquals(1, composite);
         }
     }
 }