Added functional tests for user defined exclusion strategy.

Added test to ensure empty/null properties are added for the JsonObject.

gson/src/test/java/com/google/gson/JsonObjectTest.java

@@ -30,63 +30,81 @@ public class JsonObjectTest extends TestCase {
     String propertyName = "property";
     assertFalse(jsonObj.has(propertyName));
     assertNull(jsonObj.get(propertyName));
-    
+
     JsonPrimitive value = new JsonPrimitive("blah");
     jsonObj.add(propertyName, value);
     assertEquals(value, jsonObj.get(propertyName));
-    
+
     JsonElement removedElement = jsonObj.remove(propertyName);
     assertEquals(value, removedElement);
     assertFalse(jsonObj.has(propertyName));
   }
-  
+
-  public void testAddingNullProperties() throws Exception {
+  public void testAddingNullPropertyValue() throws Exception {
     String propertyName = "property";
     JsonObject jsonObj = new JsonObject();
     jsonObj.add(propertyName, null);
-    
+
     assertTrue(jsonObj.has(propertyName));
-    
+
     JsonElement jsonElement = jsonObj.get(propertyName);
     assertNotNull(jsonElement);
     assertTrue(jsonElement.isJsonNull());
   }
-  
+
+  public void testAddingNullOrEmptyPropertyName() throws Exception {
+    JsonObject jsonObj = new JsonObject();
+    try {
+      jsonObj.add(null, JsonNull.createJsonNull());
+      fail("Should not allow null property names.");
+    } catch (IllegalArgumentException expected) { }
+
+    try {
+      jsonObj.add("", JsonNull.createJsonNull());
+      fail("Should not allow empty property names.");
+    } catch (IllegalArgumentException expected) { }
+
+    try {
+      jsonObj.add("   \t", JsonNull.createJsonNull());
+      fail("Should not allow whitespace only property names.");
+    } catch (IllegalArgumentException expected) { }
+  }
+
   public void testAddingBooleanProperties() throws Exception {
     String propertyName = "property";
     JsonObject jsonObj = new JsonObject();
     jsonObj.addProperty(propertyName, true);
-    
+
     assertTrue(jsonObj.has(propertyName));
-    
+
     JsonElement jsonElement = jsonObj.get(propertyName);
     assertNotNull(jsonElement);
     assertTrue(jsonElement.getAsBoolean());
   }
-  
+
   public void testAddingStringProperties() throws Exception {
     String propertyName = "property";
     String value = "blah";
 
     JsonObject jsonObj = new JsonObject();
     jsonObj.addProperty(propertyName, value);
-    
+
     assertTrue(jsonObj.has(propertyName));
-    
+
     JsonElement jsonElement = jsonObj.get(propertyName);
     assertNotNull(jsonElement);
     assertEquals(value, jsonElement.getAsString());
   }
-  
+
   public void testAddingCharacterProperties() throws Exception {
     String propertyName = "property";
     char value = 'a';
 
     JsonObject jsonObj = new JsonObject();
     jsonObj.addProperty(propertyName, value);
-    
+
     assertTrue(jsonObj.has(propertyName));
-    
+
     JsonElement jsonElement = jsonObj.get(propertyName);
     assertNotNull(jsonElement);
     assertEquals(String.valueOf(value), jsonElement.getAsString());

gson/src/test/java/com/google/gson/functional/ExclusionStrategyFunctionalTest.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.gson.functional;
+
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+
+import junit.framework.TestCase;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Performs some functional tests when Gson is instantiated with some common user defined
+ * {@link ExclusionStrategy} objects.
+ *
+ * @author Inderjeet Singh
+ * @author Joel Leitch
+ */
+public class ExclusionStrategyFunctionalTest extends TestCase {
+  private SampleObjectForTest src;
+  private Gson gson;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    gson = new GsonBuilder()
+        .setExclusionStrategies(new MyExclusionStrategy(String.class))
+        .serializeNulls()
+        .create();
+    src = new SampleObjectForTest();
+  }
+
+  public void testExclusionStrategySerialization() throws Exception {
+    String json = gson.toJson(src);
+    assertFalse(json.contains("\"stringField\""));
+    assertFalse(json.contains("\"annotatedField\""));
+    assertTrue(json.contains("\"longField\""));
+  }
+
+  public void testExclusionStrategyDeserialization() throws Exception {
+    JsonObject json = new JsonObject();
+    json.add("annotatedField", new JsonPrimitive(src.annotatedField + 5));
+    json.add("stringField", new JsonPrimitive(src.stringField + "blah,blah"));
+    json.add("longField", new JsonPrimitive(1212311L));
+
+    SampleObjectForTest target = gson.fromJson(json, SampleObjectForTest.class);
+    assertEquals(1212311L, target.longField);
+
+    // assert excluded fields are set to the defaults
+    assertEquals(src.annotatedField, target.annotatedField);
+    assertEquals(src.stringField, target.stringField);
+  }
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.FIELD})
+  private static @interface Foo {
+    // Field tag only annotation
+  }
+
+  @SuppressWarnings("unused")
+  private static class SampleObjectForTest {
+    @Foo
+    private final int annotatedField;
+    private final String stringField;
+    private final long longField;
+    private final Class<?> clazzField;
+
+    public SampleObjectForTest() {
+      annotatedField = 5;
+      stringField = "someDefaultValue";
+      longField = 1234;
+      clazzField = String.class;
+    }
+  }
+
+  private static class MyExclusionStrategy implements ExclusionStrategy {
+    private final Class<?> typeToSkip;
+
+    private MyExclusionStrategy(Class<?> typeToSkip) {
+      this.typeToSkip = typeToSkip;
+    }
+
+    public boolean shouldSkipClass(Class<?> clazz) {
+      return (clazz == typeToSkip);
+    }
+
+    public boolean shouldSkipField(FieldAttributes f) {
+      return f.getAnnotation(Foo.class) != null;
+    }
+  }
+}