summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2014-05-10 01:00:45 +0200
committerPeter Wu <peter@lekensteyn.nl>2014-05-10 01:00:45 +0200
commitd1a7285924143a2430c65edbc9455b67f5fae926 (patch)
tree3c46ea702aeabe2c85625cf99e23fe3227d38f63
parent34c600891613280e41cfd1ec1ad1bee8f23d043a (diff)
downloadDatafiller-d1a7285924143a2430c65edbc9455b67f5fae926.tar.gz
user.time_zone can be null too
-rw-r--r--src/data/User.java1
-rw-r--r--test/data/ValidatingJsonDeserializerTest.java5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/data/User.java b/src/data/User.java
index 97061bc..91b5e07 100644
--- a/src/data/User.java
+++ b/src/data/User.java
@@ -7,6 +7,7 @@ public class User {
public long id;
public String name;
+ @ValidatingJsonDeserializer.Nullable
public String time_zone;
public long statuses_count;
public long followers_count;
diff --git a/test/data/ValidatingJsonDeserializerTest.java b/test/data/ValidatingJsonDeserializerTest.java
index e258be2..2d3ffd1 100644
--- a/test/data/ValidatingJsonDeserializerTest.java
+++ b/test/data/ValidatingJsonDeserializerTest.java
@@ -478,7 +478,6 @@ public class ValidatingJsonDeserializerTest {
public void testUser() {
checkImpairedUser("id");
checkImpairedUser("name");
- checkImpairedUser("time_zone");
checkImpairedUser("statuses_count");
checkImpairedUser("followers_count");
checkImpairedUser("friends_count");
@@ -494,6 +493,10 @@ public class ValidatingJsonDeserializerTest {
JsonObject tweet = buildMinimalTweet(buildMinimalUser());
removeProperty(tweet, "user", "entities");
checkTweetPass(tweet);
+
+ tweet = buildMinimalTweet(buildMinimalUser());
+ removeProperty(tweet, "user", "time_zone");
+ checkTweetPass(tweet);
}
@Test