From aee861c390afa7cea02e86f8282374592b003182 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Thu, 21 Oct 2010 18:16:32 -0700
Subject: [PATCH] got tests to pass with update message service

---
 .../todoroo/astrid/service/AstridDependencyInjector.java    | 4 +++-
 .../com/todoroo/astrid/service/UpdateMessageService.java    | 6 +++---
 .../todoroo/astrid/service/UpdateMessageServiceTest.java    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
index ff60b23ff..9caac97b6 100644
--- a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
+++ b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
@@ -5,6 +5,7 @@ package com.todoroo.astrid.service;
 
 import com.todoroo.andlib.service.AbstractDependencyInjector;
 import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.andlib.service.HttpRestClient;
 import com.todoroo.andlib.service.ExceptionService.AndroidLogReporter;
 import com.todoroo.andlib.service.ExceptionService.ErrorReporter;
 import com.todoroo.astrid.dao.Database;
@@ -14,8 +15,8 @@ import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.gtasks.GtasksListService;
 import com.todoroo.astrid.gtasks.GtasksMetadataService;
 import com.todoroo.astrid.gtasks.GtasksPreferenceService;
-import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.gtasks.GtasksTaskListUpdater;
+import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.utility.Constants;
 
 /**
@@ -46,6 +47,7 @@ public class AstridDependencyInjector extends AbstractDependencyInjector {
 
         // com.todoroo.android.service
         injectables.put("applicationName", "astrid");
+        injectables.put("restClient", HttpRestClient.class);
 
         // com.todoroo.astrid.dao
         injectables.put("database", Database.class);
diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
index 747589c39..c89b957d7 100644
--- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
@@ -108,9 +108,9 @@ public class UpdateMessageService {
                 continue;
             }
 
-            String date = update.optString("date");
-            String message = update.optString("message");
-            String plugin = update.optString("plugin");
+            String date = update.optString("date", null);
+            String message = update.optString("message", null);
+            String plugin = update.optString("plugin", null);
 
             if(message == null)
                 continue;
diff --git a/tests/src/com/todoroo/astrid/service/UpdateMessageServiceTest.java b/tests/src/com/todoroo/astrid/service/UpdateMessageServiceTest.java
index fdb1478d1..70f571e03 100644
--- a/tests/src/com/todoroo/astrid/service/UpdateMessageServiceTest.java
+++ b/tests/src/com/todoroo/astrid/service/UpdateMessageServiceTest.java
@@ -24,7 +24,7 @@ public class UpdateMessageServiceTest extends TodorooTestCase {
 
             @Override
             String getUpdates(String url) throws IOException {
-                assertTrue(url.contains("language=EN"));
+                assertTrue(url, url.contains("language=eng"));
                 assertTrue(url.contains("version="));
                 return "";
             }