2 files changed, 22 insertions, 6 deletions
diff --git a/src/main/Main.java b/src/main/Main.java
index 1f45fe9..e7fc372 100644
--- a/src/main/Main.java
+++ b/src/main/Main.java
@@ -136,7 +136,8 @@ public class Main implements Callable<Boolean> {
     }
 
     public int getProcessedTweets() {
-        return tweetNo;
+        // tweetNo is the tweet number of the tweet that is being processed.
+        return Math.min(0, tweetNo - 1);
     }
 
     @Override
@@ -145,6 +146,8 @@ public class Main implements Callable<Boolean> {
         boolean success = false;
         try {
             if (m_filename == null) {
+                System.err.println("Reading lines of tweets from standard input!");
+                System.err.println("If you want to read tweets, run with a given file.");
                 reader = new TweetReader(System.in);
             } else if (m_filename.endsWith(".gz")) {
                 reader = new CompressedTweetReader(m_filename);
diff --git a/test/data/ValidatingJsonDeserializerTest.java b/test/data/ValidatingJsonDeserializerTest.java
index 214f33f..fdaf27f 100644
--- a/test/data/ValidatingJsonDeserializerTest.java
+++ b/test/data/ValidatingJsonDeserializerTest.java
@@ -450,7 +450,6 @@ public class ValidatingJsonDeserializerTest {
     @Test
     public void testTweet() {
         checkImpairedTweet("id");
-        checkImpairedTweet("lang");
         checkImpairedTweet("created_at");
         checkImpairedTweet("favorite_count");
         checkImpairedTweet("text");
@@ -472,6 +471,10 @@ public class ValidatingJsonDeserializerTest {
         tweet = buildMinimalTweet(buildMinimalUser());
         removeProperty(tweet, "coordinates");
         checkTweetPass(tweet);
+
+        tweet = buildMinimalTweet(buildMinimalUser());
+        removeProperty(tweet, "lang");
+        checkTweetPass(tweet);
     }
 
     @Test
@@ -514,16 +517,14 @@ public class ValidatingJsonDeserializerTest {
         checkImpairedUser("statuses_count");
         checkImpairedUser("followers_count");
         checkImpairedUser("friends_count");
-        checkImpairedUser("location");
         checkImpairedUser("screen_name");
         checkImpairedUser("created_at");
         checkImpairedUser("lang");
-        checkImpairedUser("description");
         checkImpairedUser("verified");
     }
 
     @Test
-    public void testNullUserEntities() {
+    public void testNullUserFields() {
         // entities can be null
         JsonObject tweet = buildMinimalTweet(buildMinimalUser());
         removeProperty(tweet, "user", "entities");
@@ -532,6 +533,14 @@ public class ValidatingJsonDeserializerTest {
         tweet = buildMinimalTweet(buildMinimalUser());
         removeProperty(tweet, "user", "time_zone");
         checkTweetPass(tweet);
+
+        tweet = buildMinimalTweet(buildMinimalUser());
+        removeProperty(tweet, "user", "location");
+        checkTweetPass(tweet);
+
+        tweet = buildMinimalTweet(buildMinimalUser());
+        removeProperty(tweet, "user", "description");
+        checkTweetPass(tweet);
     }
 
     @Test
@@ -563,11 +572,15 @@ public class ValidatingJsonDeserializerTest {
     }
 
     @Test
-    public void testNullPlace() {
+    public void testNullTweetFields() {
         JsonObject tweet = buildMinimalTweet(buildMinimalUser());
         removeProperty(tweet, "place");
         tweet.add("place", null);
         checkTweetPass(tweet);
+
+        tweet = buildMinimalTweet(buildMinimalUser());
+        removeProperty(tweet, "lang");
+        checkTweetPass(tweet);
     }
 
     @Test