Move SQL types specific tests to separate test class
This commit is contained in:
parent
380c4ec12c
commit
4fb215c9df
@ -69,12 +69,14 @@ import junit.framework.TestCase;
|
|||||||
public class DefaultTypeAdaptersTest extends TestCase {
|
public class DefaultTypeAdaptersTest extends TestCase {
|
||||||
private Gson gson;
|
private Gson gson;
|
||||||
private TimeZone oldTimeZone;
|
private TimeZone oldTimeZone;
|
||||||
|
private Locale oldLocale;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void setUp() throws Exception {
|
protected void setUp() throws Exception {
|
||||||
super.setUp();
|
super.setUp();
|
||||||
this.oldTimeZone = TimeZone.getDefault();
|
this.oldTimeZone = TimeZone.getDefault();
|
||||||
TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
|
TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
|
||||||
|
this.oldLocale = Locale.getDefault();
|
||||||
Locale.setDefault(Locale.US);
|
Locale.setDefault(Locale.US);
|
||||||
gson = new Gson();
|
gson = new Gson();
|
||||||
}
|
}
|
||||||
@ -82,6 +84,7 @@ public class DefaultTypeAdaptersTest extends TestCase {
|
|||||||
@Override
|
@Override
|
||||||
protected void tearDown() throws Exception {
|
protected void tearDown() throws Exception {
|
||||||
TimeZone.setDefault(oldTimeZone);
|
TimeZone.setDefault(oldTimeZone);
|
||||||
|
Locale.setDefault(oldLocale);
|
||||||
super.tearDown();
|
super.tearDown();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -175,14 +178,15 @@ public class DefaultTypeAdaptersTest extends TestCase {
|
|||||||
testNullSerializationAndDeserialization(Date.class);
|
testNullSerializationAndDeserialization(Date.class);
|
||||||
testNullSerializationAndDeserialization(GregorianCalendar.class);
|
testNullSerializationAndDeserialization(GregorianCalendar.class);
|
||||||
testNullSerializationAndDeserialization(Calendar.class);
|
testNullSerializationAndDeserialization(Calendar.class);
|
||||||
testNullSerializationAndDeserialization(Time.class);
|
|
||||||
testNullSerializationAndDeserialization(Timestamp.class);
|
|
||||||
testNullSerializationAndDeserialization(java.sql.Date.class);
|
|
||||||
testNullSerializationAndDeserialization(Enum.class);
|
testNullSerializationAndDeserialization(Enum.class);
|
||||||
testNullSerializationAndDeserialization(Class.class);
|
testNullSerializationAndDeserialization(Class.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void testNullSerializationAndDeserialization(Class<?> c) {
|
private void testNullSerializationAndDeserialization(Class<?> c) {
|
||||||
|
testNullSerializationAndDeserialization(gson, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void testNullSerializationAndDeserialization(Gson gson, Class<?> c) {
|
||||||
assertEquals("null", gson.toJson(null, c));
|
assertEquals("null", gson.toJson(null, c));
|
||||||
assertEquals(null, gson.fromJson("null", c));
|
assertEquals(null, gson.fromJson("null", c));
|
||||||
}
|
}
|
||||||
@ -347,60 +351,19 @@ public class DefaultTypeAdaptersTest extends TestCase {
|
|||||||
// Date can not directly be compared with another instance since the deserialization loses the
|
// Date can not directly be compared with another instance since the deserialization loses the
|
||||||
// millisecond portion.
|
// millisecond portion.
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
private void assertEqualsDate(Date date, int year, int month, int day) {
|
public static void assertEqualsDate(Date date, int year, int month, int day) {
|
||||||
assertEquals(year-1900, date.getYear());
|
assertEquals(year-1900, date.getYear());
|
||||||
assertEquals(month, date.getMonth());
|
assertEquals(month, date.getMonth());
|
||||||
assertEquals(day, date.getDate());
|
assertEquals(day, date.getDate());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
private void assertEqualsTime(Date date, int hours, int minutes, int seconds) {
|
public static void assertEqualsTime(Date date, int hours, int minutes, int seconds) {
|
||||||
assertEquals(hours, date.getHours());
|
assertEquals(hours, date.getHours());
|
||||||
assertEquals(minutes, date.getMinutes());
|
assertEquals(minutes, date.getMinutes());
|
||||||
assertEquals(seconds, date.getSeconds());
|
assertEquals(seconds, date.getSeconds());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testDefaultJavaSqlDateSerialization() {
|
|
||||||
java.sql.Date instant = new java.sql.Date(1259875082000L);
|
|
||||||
String json = gson.toJson(instant);
|
|
||||||
assertEquals("\"Dec 3, 2009\"", json);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testDefaultJavaSqlDateDeserialization() {
|
|
||||||
String json = "'Dec 3, 2009'";
|
|
||||||
java.sql.Date extracted = gson.fromJson(json, java.sql.Date.class);
|
|
||||||
assertEqualsDate(extracted, 2009, 11, 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testDefaultJavaSqlTimestampSerialization() {
|
|
||||||
Timestamp now = new java.sql.Timestamp(1259875082000L);
|
|
||||||
String json = gson.toJson(now);
|
|
||||||
if (JavaVersion.isJava9OrLater()) {
|
|
||||||
assertEquals("\"Dec 3, 2009, 1:18:02 PM\"", json);
|
|
||||||
} else {
|
|
||||||
assertEquals("\"Dec 3, 2009 1:18:02 PM\"", json);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testDefaultJavaSqlTimestampDeserialization() {
|
|
||||||
String json = "'Dec 3, 2009 1:18:02 PM'";
|
|
||||||
Timestamp extracted = gson.fromJson(json, Timestamp.class);
|
|
||||||
assertEqualsDate(extracted, 2009, 11, 3);
|
|
||||||
assertEqualsTime(extracted, 13, 18, 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testDefaultJavaSqlTimeSerialization() {
|
|
||||||
Time now = new Time(1259875082000L);
|
|
||||||
String json = gson.toJson(now);
|
|
||||||
assertEquals("\"01:18:02 PM\"", json);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testDefaultJavaSqlTimeDeserialization() {
|
|
||||||
String json = "'1:18:02 PM'";
|
|
||||||
Time extracted = gson.fromJson(json, Time.class);
|
|
||||||
assertEqualsTime(extracted, 13, 18, 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testDefaultDateSerializationUsingBuilder() throws Exception {
|
public void testDefaultDateSerializationUsingBuilder() throws Exception {
|
||||||
Gson gson = new GsonBuilder().create();
|
Gson gson = new GsonBuilder().create();
|
||||||
Date now = new Date(1315806903103L);
|
Date now = new Date(1315806903103L);
|
||||||
@ -524,42 +487,6 @@ public class DefaultTypeAdaptersTest extends TestCase {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// http://code.google.com/p/google-gson/issues/detail?id=230
|
|
||||||
public void testTimestampSerialization() throws Exception {
|
|
||||||
TimeZone defaultTimeZone = TimeZone.getDefault();
|
|
||||||
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
|
|
||||||
Locale defaultLocale = Locale.getDefault();
|
|
||||||
Locale.setDefault(Locale.US);
|
|
||||||
try {
|
|
||||||
Timestamp timestamp = new Timestamp(0L);
|
|
||||||
Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
|
|
||||||
String json = gson.toJson(timestamp, Timestamp.class);
|
|
||||||
assertEquals("\"1970-01-01\"", json);
|
|
||||||
assertEquals(0, gson.fromJson("\"1970-01-01\"", Timestamp.class).getTime());
|
|
||||||
} finally {
|
|
||||||
TimeZone.setDefault(defaultTimeZone);
|
|
||||||
Locale.setDefault(defaultLocale);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// http://code.google.com/p/google-gson/issues/detail?id=230
|
|
||||||
public void testSqlDateSerialization() throws Exception {
|
|
||||||
TimeZone defaultTimeZone = TimeZone.getDefault();
|
|
||||||
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
|
|
||||||
Locale defaultLocale = Locale.getDefault();
|
|
||||||
Locale.setDefault(Locale.US);
|
|
||||||
try {
|
|
||||||
java.sql.Date sqlDate = new java.sql.Date(0L);
|
|
||||||
Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
|
|
||||||
String json = gson.toJson(sqlDate, Timestamp.class);
|
|
||||||
assertEquals("\"1970-01-01\"", json);
|
|
||||||
assertEquals(0, gson.fromJson("\"1970-01-01\"", java.sql.Date.class).getTime());
|
|
||||||
} finally {
|
|
||||||
TimeZone.setDefault(defaultTimeZone);
|
|
||||||
Locale.setDefault(defaultLocale);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testJsonPrimitiveSerialization() {
|
public void testJsonPrimitiveSerialization() {
|
||||||
assertEquals("5", gson.toJson(new JsonPrimitive(5), JsonElement.class));
|
assertEquals("5", gson.toJson(new JsonPrimitive(5), JsonElement.class));
|
||||||
assertEquals("true", gson.toJson(new JsonPrimitive(true), JsonElement.class));
|
assertEquals("true", gson.toJson(new JsonPrimitive(true), JsonElement.class));
|
||||||
|
@ -0,0 +1,124 @@
|
|||||||
|
package com.google.gson.internal.sql;
|
||||||
|
|
||||||
|
import java.sql.Date;
|
||||||
|
import java.sql.Time;
|
||||||
|
import java.sql.Timestamp;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.TimeZone;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
import com.google.gson.GsonBuilder;
|
||||||
|
import com.google.gson.functional.DefaultTypeAdaptersTest;
|
||||||
|
import com.google.gson.internal.JavaVersion;
|
||||||
|
|
||||||
|
import junit.framework.TestCase;
|
||||||
|
|
||||||
|
public class SqlTypesGsonTest extends TestCase {
|
||||||
|
private Gson gson;
|
||||||
|
private TimeZone oldTimeZone;
|
||||||
|
private Locale oldLocale;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void setUp() throws Exception {
|
||||||
|
super.setUp();
|
||||||
|
this.oldTimeZone = TimeZone.getDefault();
|
||||||
|
TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
|
||||||
|
this.oldLocale = Locale.getDefault();
|
||||||
|
Locale.setDefault(Locale.US);
|
||||||
|
gson = new Gson();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void tearDown() throws Exception {
|
||||||
|
super.tearDown();
|
||||||
|
TimeZone.setDefault(oldTimeZone);
|
||||||
|
Locale.setDefault(oldLocale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testNullSerializationAndDeserialization() {
|
||||||
|
testNullSerializationAndDeserialization(Date.class);
|
||||||
|
testNullSerializationAndDeserialization(Time.class);
|
||||||
|
testNullSerializationAndDeserialization(Timestamp.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void testNullSerializationAndDeserialization(Class<?> c) {
|
||||||
|
DefaultTypeAdaptersTest.testNullSerializationAndDeserialization(gson, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testDefaultSqlDateSerialization() {
|
||||||
|
java.sql.Date instant = new java.sql.Date(1259875082000L);
|
||||||
|
String json = gson.toJson(instant);
|
||||||
|
assertEquals("\"Dec 3, 2009\"", json);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testDefaultSqlDateDeserialization() {
|
||||||
|
String json = "'Dec 3, 2009'";
|
||||||
|
java.sql.Date extracted = gson.fromJson(json, java.sql.Date.class);
|
||||||
|
DefaultTypeAdaptersTest.assertEqualsDate(extracted, 2009, 11, 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
// http://code.google.com/p/google-gson/issues/detail?id=230
|
||||||
|
public void testSqlDateSerialization() throws Exception {
|
||||||
|
TimeZone defaultTimeZone = TimeZone.getDefault();
|
||||||
|
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
|
||||||
|
Locale defaultLocale = Locale.getDefault();
|
||||||
|
Locale.setDefault(Locale.US);
|
||||||
|
try {
|
||||||
|
java.sql.Date sqlDate = new java.sql.Date(0L);
|
||||||
|
Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
|
||||||
|
String json = gson.toJson(sqlDate, Timestamp.class);
|
||||||
|
assertEquals("\"1970-01-01\"", json);
|
||||||
|
assertEquals(0, gson.fromJson("\"1970-01-01\"", java.sql.Date.class).getTime());
|
||||||
|
} finally {
|
||||||
|
TimeZone.setDefault(defaultTimeZone);
|
||||||
|
Locale.setDefault(defaultLocale);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testDefaultSqlTimeSerialization() {
|
||||||
|
Time now = new Time(1259875082000L);
|
||||||
|
String json = gson.toJson(now);
|
||||||
|
assertEquals("\"01:18:02 PM\"", json);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testDefaultSqlTimeDeserialization() {
|
||||||
|
String json = "'1:18:02 PM'";
|
||||||
|
Time extracted = gson.fromJson(json, Time.class);
|
||||||
|
DefaultTypeAdaptersTest.assertEqualsTime(extracted, 13, 18, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testDefaultSqlTimestampSerialization() {
|
||||||
|
Timestamp now = new java.sql.Timestamp(1259875082000L);
|
||||||
|
String json = gson.toJson(now);
|
||||||
|
if (JavaVersion.isJava9OrLater()) {
|
||||||
|
assertEquals("\"Dec 3, 2009, 1:18:02 PM\"", json);
|
||||||
|
} else {
|
||||||
|
assertEquals("\"Dec 3, 2009 1:18:02 PM\"", json);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testDefaultSqlTimestampDeserialization() {
|
||||||
|
String json = "'Dec 3, 2009 1:18:02 PM'";
|
||||||
|
Timestamp extracted = gson.fromJson(json, Timestamp.class);
|
||||||
|
DefaultTypeAdaptersTest.assertEqualsDate(extracted, 2009, 11, 3);
|
||||||
|
DefaultTypeAdaptersTest.assertEqualsTime(extracted, 13, 18, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
// http://code.google.com/p/google-gson/issues/detail?id=230
|
||||||
|
public void testTimestampSerialization() throws Exception {
|
||||||
|
TimeZone defaultTimeZone = TimeZone.getDefault();
|
||||||
|
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
|
||||||
|
Locale defaultLocale = Locale.getDefault();
|
||||||
|
Locale.setDefault(Locale.US);
|
||||||
|
try {
|
||||||
|
Timestamp timestamp = new Timestamp(0L);
|
||||||
|
Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
|
||||||
|
String json = gson.toJson(timestamp, Timestamp.class);
|
||||||
|
assertEquals("\"1970-01-01\"", json);
|
||||||
|
assertEquals(0, gson.fromJson("\"1970-01-01\"", Timestamp.class).getTime());
|
||||||
|
} finally {
|
||||||
|
TimeZone.setDefault(defaultTimeZone);
|
||||||
|
Locale.setDefault(defaultLocale);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user