You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2014/10/23 17:56:51 UTC

svn commit: r1633850 - in /tika/trunk/tika-serialization: pom.xml src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java

Author: tallison
Date: Thu Oct 23 15:56:51 2014
New Revision: 1633850

URL: http://svn.apache.org/r1633850
Log:
upgrade gson to 2.2.4

Modified:
    tika/trunk/tika-serialization/pom.xml
    tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
    tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java

Modified: tika/trunk/tika-serialization/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-serialization/pom.xml?rev=1633850&r1=1633849&r2=1633850&view=diff
==============================================================================
--- tika/trunk/tika-serialization/pom.xml (original)
+++ tika/trunk/tika-serialization/pom.xml Thu Oct 23 15:56:51 2014
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>1.7.1</version>
+      <version>2.2.4</version>
     </dependency>
 
     <!-- Test dependencies -->

Modified: tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java?rev=1633850&r1=1633849&r2=1633850&view=diff
==============================================================================
--- tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java (original)
+++ tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java Thu Oct 23 15:56:51 2014
@@ -63,7 +63,7 @@ public class JsonMetadataListTest {
     public void testListNull() throws Exception {
         StringWriter writer = new StringWriter();
         JsonMetadataList.toJson(null, writer);
-        assertEquals("", writer.toString().trim());
+        assertEquals("null", writer.toString().trim());
 
         List<Metadata> m = JsonMetadataList.fromJson(null);
         assertNull(m);

Modified: tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java?rev=1633850&r1=1633849&r2=1633850&view=diff
==============================================================================
--- tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java (original)
+++ tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java Thu Oct 23 15:56:51 2014
@@ -100,7 +100,7 @@ public class JsonMetadataTest {
             ex = true;
         }
         assertFalse(ex);
-        assertEquals("", writer.toString());        
+        assertEquals("null", writer.toString());        
     }
 
     @Test