archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed compilation errors in UpdateMessageServiceTest

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent a54951f4d9
commit 0de8e7ca4b
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File

63
tests/src/com/todoroo/astrid/service/UpdateMessageServiceTest.java
Unescape Escape View File

@ -17,6 +17,7 @@ import android.text.style.ClickableSpan;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.RestClient; import com.todoroo.andlib.service.RestClient;
import com.todoroo.andlib.utility.Pair;
import com.todoroo.astrid.dao.StoreObjectDao; import com.todoroo.astrid.dao.StoreObjectDao;
import com.todoroo.astrid.dao.StoreObjectDao.StoreObjectCriteria; import com.todoroo.astrid.dao.StoreObjectDao.StoreObjectCriteria;
import com.todoroo.astrid.test.DatabaseTestCase; import com.todoroo.astrid.test.DatabaseTestCase;
@ -32,7 +33,7 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
fail("should not have displayed updates"); fail("should not have displayed updates");
} }
@ -51,7 +52,7 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
fail("should not have displayed updates"); fail("should not have displayed updates");
} }
@ -68,8 +69,8 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
assertTrue(message.toString().contains("yo")); assertTrue(message.getLeft().toString().contains("yo"));
} }
@Override @Override
@ -85,9 +86,9 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
assertTrue(message.toString().contains("yo")); assertTrue(message.getLeft().toString().contains("yo"));
assertFalse(message.toString().contains("cat")); // We only process the first update now assertFalse(message.getLeft().toString().contains("cat")); // We only process the first update now
} }
@Override @Override
@ -103,8 +104,8 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
assertTrue(message.toString().contains("yo")); assertTrue(message.getLeft().toString().contains("yo"));
} }
@Override @Override
@ -116,7 +117,7 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
fail("should have not displayed again"); fail("should have not displayed again");
} }
@ -138,9 +139,9 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
assertTrue(message.toString().contains("yo")); assertTrue(message.getLeft().toString().contains("yo"));
assertTrue(message.toString().contains("date")); assertTrue(message.getLeft().toString().contains("date"));
} }
@Override @Override
@ -157,8 +158,8 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
assertTrue(message.toString().contains("rmilk man")); assertTrue(message.getLeft().toString().contains("rmilk man"));
} }
@Override @Override
@ -175,7 +176,7 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
fail("displayed update"); fail("displayed update");
} }
@ -197,8 +198,8 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
assertTrue(message.toString().contains("astrid man")); assertTrue(message.getLeft().toString().contains("astrid man"));
} }
@Override @Override
@ -214,7 +215,7 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
fail("displayed update"); fail("displayed update");
} }
@ -236,9 +237,9 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
assertTrue(message instanceof Spannable); assertNotNull(message.getRight());
assertTrue(((Spannable)message).getSpans(0, message.length(), ClickableSpan.class).length > 0); assertTrue(((Spannable)message).getSpans(0, message.getRight().length(), ClickableSpan.class).length > 0);
} }
@Override @Override
@ -254,9 +255,9 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
new TestUpdateMessageService() { new TestUpdateMessageService() {
@Override @Override
void verifyMessage(CharSequence message) { void verifyMessage(Pair<String, Spannable> message) {
assertTrue(message instanceof Spannable); assertNotNull(message.getRight());
assertTrue(((Spannable)message).getSpans(0, message.length(), ClickableSpan.class).length > 0); assertTrue(((Spannable)message).getSpans(0, message.getRight().length(), ClickableSpan.class).length > 0);
} }
@Override @Override
@ -289,7 +290,7 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
}; };
} }
abstract void verifyMessage(CharSequence message); abstract void verifyMessage(Pair<String, Spannable> message);
abstract String getUpdates(String url) throws IOException; abstract String getUpdates(String url) throws IOException;
@ -298,15 +299,15 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
} }
@Override @Override
protected CharSequence buildUpdateMessage(JSONArray updates) { protected Pair<String, Spannable> buildUpdateMessage(JSONArray updates) {
CharSequence builder = super.buildUpdateMessage(updates); Pair<String, Spannable> message = super.buildUpdateMessage(updates);
if(builder.length() == 0) if(message == null || message.getLeft().length() == 0)
onEmptyMessage(); onEmptyMessage();
return builder; return message;
} }
@Override @Override
protected void displayUpdateDialog(CharSequence builder) { protected void displayUpdateDialog(Pair<String, Spannable> builder) {
verifyMessage(builder); verifyMessage(builder);
} }
} }

Write Preview
Loading…
Cancel
Save