From f2eb76eac92ac79323fa6add427fd9123552a312 Mon Sep 17 00:00:00 2001
From: Inderjeet Singh <inder123@gmail.com>
Date: Wed, 25 May 2011 16:48:39 +0000
Subject: [PATCH] removed deprecation warnings by using JsonNull.INSTANCE

---
 gson/src/test/java/com/google/gson/JsonArrayTest.java           | 2 +-
 gson/src/test/java/com/google/gson/JsonNullTest.java            | 2 ++
 gson/src/test/java/com/google/gson/JsonObjectTest.java          | 2 +-
 .../java/com/google/gson/functional/NullObjectAndFieldTest.java | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/JsonArrayTest.java b/gson/src/test/java/com/google/gson/JsonArrayTest.java
index fdbd7883..6c8ddf3e 100644
--- a/gson/src/test/java/com/google/gson/JsonArrayTest.java
+++ b/gson/src/test/java/com/google/gson/JsonArrayTest.java
@@ -45,7 +45,7 @@ public final class JsonArrayTest extends TestCase {
     assertFalse(a.equals(b));
     assertFalse(b.equals(a));
 
-    b.add(new JsonNull());
+    b.add(JsonNull.INSTANCE);
     assertFalse(a.equals(b));
     assertFalse(b.equals(a));
   }
diff --git a/gson/src/test/java/com/google/gson/JsonNullTest.java b/gson/src/test/java/com/google/gson/JsonNullTest.java
index 004e83b6..9e3c6ea9 100644
--- a/gson/src/test/java/com/google/gson/JsonNullTest.java
+++ b/gson/src/test/java/com/google/gson/JsonNullTest.java
@@ -24,8 +24,10 @@ import junit.framework.TestCase;
  */
 public final class JsonNullTest extends TestCase {
 
+  @SuppressWarnings("deprecation")
   public void testEqualsAndHashcode() {
     MoreAsserts.assertEqualsAndHashCode(new JsonNull(), new JsonNull());
+    MoreAsserts.assertEqualsAndHashCode(new JsonNull(), JsonNull.INSTANCE);
     MoreAsserts.assertEqualsAndHashCode(new JsonNull(), JsonNull.createJsonNull());
     MoreAsserts.assertEqualsAndHashCode(JsonNull.createJsonNull(), JsonNull.createJsonNull());
   }
diff --git a/gson/src/test/java/com/google/gson/JsonObjectTest.java b/gson/src/test/java/com/google/gson/JsonObjectTest.java
index 17f84738..9065ca71 100644
--- a/gson/src/test/java/com/google/gson/JsonObjectTest.java
+++ b/gson/src/test/java/com/google/gson/JsonObjectTest.java
@@ -151,7 +151,7 @@ public class JsonObjectTest extends TestCase {
     assertFalse(a.equals(b));
     assertFalse(b.equals(a));
 
-    b.add("bar", new JsonNull());
+    b.add("bar", JsonNull.INSTANCE);
     assertFalse(a.equals(b));
     assertFalse(b.equals(a));
   }
diff --git a/gson/src/test/java/com/google/gson/functional/NullObjectAndFieldTest.java b/gson/src/test/java/com/google/gson/functional/NullObjectAndFieldTest.java
index fa7b8195..04f55d67 100755
--- a/gson/src/test/java/com/google/gson/functional/NullObjectAndFieldTest.java
+++ b/gson/src/test/java/com/google/gson/functional/NullObjectAndFieldTest.java
@@ -164,7 +164,7 @@ public class NullObjectAndFieldTest extends TestCase {
     public JsonElement serialize(ClassWithObjects src, Type typeOfSrc,
         JsonSerializationContext context) {
       JsonObject obj = new JsonObject();
-      obj.add("bag", new JsonNull());
+      obj.add("bag", JsonNull.INSTANCE);
       return obj;
     }
   }