Merge pull request #143 from ashu01/dev-master

Code Cleanup

Author: taowen

src/test/java/com/jsoniter/any/TestList.java

@@ -4,6 +4,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 
 public class TestList extends TestCase {
     public void test_size() {
@@ -12,14 +13,14 @@ public void test_size() {
     }
 
     public void test_to_boolean() {
-        Any any = Any.wrap(Arrays.asList());
+        Any any = Any.wrap(Collections.emptyList());
         assertFalse(any.toBoolean());
         any = Any.wrap(Arrays.asList("hello", 1));
         assertTrue(any.toBoolean());
     }
 
     public void test_to_int() {
-        Any any = Any.wrap(Arrays.asList());
+        Any any = Any.wrap(Collections.emptyList());
         assertEquals(0, any.toInt());
         any = Any.wrap(Arrays.asList("hello", 1));
         assertEquals(2, any.toInt());
@@ -31,7 +32,7 @@ public void test_get() {
     }
 
     public void test_get_from_nested() {
-        Any any = Any.wrap(Arrays.asList(Arrays.asList("hello"), Arrays.asList("world")));
+        Any any = Any.wrap(Arrays.asList(Collections.singletonList("hello"), Collections.singletonList("world")));
         assertEquals("hello", any.get(0, 0).toString());
         assertEquals("[\"hello\",\"world\"]", any.get('*', 0).toString());
     }

src/test/java/com/jsoniter/any/TestMap.java

@@ -1,6 +1,5 @@
 package com.jsoniter.any;
 
-import com.jsoniter.JsonIterator;
 import junit.framework.TestCase;
 
 import java.util.HashMap;

src/test/java/com/jsoniter/extra/TestJdkDatetime.java

@@ -1,7 +1,6 @@
 package com.jsoniter.extra;
 
 import com.jsoniter.JsonIterator;
-import com.jsoniter.extra.JdkDatetimeSupport;
 import com.jsoniter.output.JsonStream;
 import junit.framework.TestCase;
 

src/test/java/com/jsoniter/output/TestGson.java

@@ -11,7 +11,6 @@
 
 import java.lang.reflect.Field;
 import java.text.DateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
@@ -108,22 +107,6 @@ public void test_serializeNulls() {
         assertEquals("{\"field1\":null,\"field2\":0}", output);
     }
 
-//    public void test_setDateFormat_no_op() {
-//        TimeZone orig = TimeZone.getDefault();
-//        try {
-//            TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-//            Gson gson = new GsonBuilder().create();
-//            String output = gson.toJson(new Date(0));
-//            assertEquals("\"Jan 1, 1970 12:00:00 AM\"", output);
-//            GsonCompatibilityMode config = new GsonCompatibilityMode.Builder()
-//                    .build();
-//            output = JsonStream.serialize(config, new Date(0));
-//            assertEquals("\"Jan 1, 1970 12:00:00 AM\"", output);
-//        } finally {
-//            TimeZone.setDefault(orig);
-//        }
-//    }
-
     public void test_setDateFormat_with_style() {
         TimeZone orig = TimeZone.getDefault();
         try {

src/test/java/com/jsoniter/output/TestObject.java

@@ -148,7 +148,7 @@ public void test_not_nullable() {
         try {
             JsonStream.serialize(config, new TestObject8());
             fail();
-        } catch (NullPointerException e) {
+        } catch (NullPointerException ignore) {
         }
     }
 
@@ -176,7 +176,7 @@ public void test_collection_value_not_nullable() {
         try {
             JsonStream.serialize(config, obj);
             fail();
-        } catch (NullPointerException e) {
+        } catch (NullPointerException ignore) {
         }
 
         obj = new TestObject9();
@@ -185,7 +185,7 @@ public void test_collection_value_not_nullable() {
         try {
             JsonStream.serialize(config, obj);
             fail();
-        } catch (NullPointerException e) {
+        } catch (NullPointerException ignore) {
         }
 
         obj = new TestObject9();
@@ -194,7 +194,7 @@ public void test_collection_value_not_nullable() {
         try {
             JsonStream.serialize(config, obj);
             fail();
-        } catch (NullPointerException e) {
+        } catch (NullPointerException ignore) {
         }
 
         obj = new TestObject9();
@@ -203,7 +203,7 @@ public void test_collection_value_not_nullable() {
         try {
             JsonStream.serialize(config, obj);
             fail();
-        } catch (NullPointerException e) {
+        } catch (NullPointerException ignore) {
         }
     }
 
@@ -265,7 +265,7 @@ public void test_private_class() {
         try {
             JsonStream.serialize(new TestObject13());
             fail("should throw JsonException");
-        } catch (JsonException e) {
+        } catch (JsonException ignore) {
 
         }
     }

src/test/java/com/jsoniter/output/TestSpiPropertyEncoder.java

@@ -1,12 +1,9 @@
 package com.jsoniter.output;
 
-import com.jsoniter.any.Any;
 import com.jsoniter.spi.Encoder;
 import com.jsoniter.spi.JsoniterSpi;
 import com.jsoniter.spi.TypeLiteral;
 import junit.framework.TestCase;
-
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 public class TestSpiPropertyEncoder extends TestCase {

src/test/java/com/jsoniter/output/TestSpiTypeEncoder.java

@@ -6,7 +6,7 @@
 import junit.framework.TestCase;
 
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -47,7 +47,7 @@ public void encode(Object obj, JsonStream stream) throws IOException {
         });
         MyDate myDate = new MyDate();
         myDate.date = new Date(1481365190000L);
-        String output = JsonStream.serialize(typeLiteral, Arrays.asList(myDate));
+        String output = JsonStream.serialize(typeLiteral, Collections.singletonList(myDate));
         assertEquals("1481365190000", output);
     }
 }