You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2011/03/21 10:18:58 UTC

svn commit: r1083710 - in /tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft: ExcelParserTest.java ooxml/OOXMLParserTest.java

Author: maxcom
Date: Mon Mar 21 09:18:58 2011
New Revision: 1083710

URL: http://svn.apache.org/viewvc?rev=1083710&view=rev
Log:
update Excel number-format tests for use with latest POI trunk

Modified:
    tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
    tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java

Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java?rev=1083710&r1=1083709&r2=1083710&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java Mon Mar 21 09:18:58 2011
@@ -80,8 +80,9 @@ public class ExcelParserTest extends Tes
             assertTrue(content.contains("($1,599.99)"));
 
             // Scientific 0.00E+00
-            assertTrue(content.contains("1.98E08"));
-            assertTrue(content.contains("-1.98E08"));
+            // poi <=3.8beta1 returns 1.98E08, newer versions return 1.98+E08
+            assertTrue(content.contains("1.98E08") || content.contains("1.98E+08"));
+            assertTrue(content.contains("-1.98E08") || content.contains("-1.98E+08"));
 
             // Percentage.
             assertTrue(content.contains("2.50%"));

Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java?rev=1083710&r1=1083709&r2=1083710&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java Mon Mar 21 09:18:58 2011
@@ -107,9 +107,10 @@ public class OOXMLParserTest extends Tes
             assertTrue(content.contains("$1,599.99"));
             assertTrue(content.contains("$1,599.99)"));
 
-            // Scientific 0.00E+00
-            assertTrue(content.contains("1.98E08"));
-            assertTrue(content.contains("-1.98E08"));
+          // Scientific 0.00E+00
+          // poi <=3.8beta1 returns 1.98E08, newer versions return 1.98+E08
+          assertTrue(content.contains("1.98E08") || content.contains("1.98E+08"));
+          assertTrue(content.contains("-1.98E08") || content.contains("-1.98E+08"));
 
             // Percentage
             assertTrue(content.contains("2.50%"));