From 4182300153fe479df183f73ae28390193068e36f Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 15 Jan 2020 16:10:31 -0600 Subject: [PATCH] Add Google Tasks findChildrenInList test --- .../java/org/tasks/data/GoogleTaskDaoTests.java | 12 ++++++++++++ .../java/org/tasks/makers/GoogleTaskMaker.java | 2 ++ 2 files changed, 14 insertions(+) diff --git a/app/src/androidTest/java/org/tasks/data/GoogleTaskDaoTests.java b/app/src/androidTest/java/org/tasks/data/GoogleTaskDaoTests.java index c0b3f0adf..7e70c0359 100644 --- a/app/src/androidTest/java/org/tasks/data/GoogleTaskDaoTests.java +++ b/app/src/androidTest/java/org/tasks/data/GoogleTaskDaoTests.java @@ -1,8 +1,11 @@ package org.tasks.data; import static com.natpryce.makeiteasy.MakeItEasy.with; +import static java.util.Collections.singletonList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.tasks.makers.GoogleTaskMaker.LIST; +import static org.tasks.makers.GoogleTaskMaker.PARENT; import static org.tasks.makers.GoogleTaskMaker.REMOTE_ID; import static org.tasks.makers.GoogleTaskMaker.TASK; import static org.tasks.makers.GoogleTaskMaker.newGoogleTask; @@ -10,6 +13,7 @@ import static org.tasks.makers.GtaskListMaker.newGtaskList; import static org.tasks.makers.TaskMaker.newTask; import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.google.common.primitives.Longs; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; import java.util.List; @@ -165,6 +169,14 @@ public class GoogleTaskDaoTests extends InjectingTestCase { assertEquals(2, googleTaskDao.getByRemoteId("1").getOrder()); } + @Test + public void findChildrenInList() { + googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1"))); + googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "1"), with(PARENT, 1L))); + + assertEquals(singletonList(2L), googleTaskDao.findChildrenInList(Longs.asList(1, 2))); + } + private void insertTop(GoogleTask googleTask) { insert(googleTask, true); } diff --git a/app/src/androidTest/java/org/tasks/makers/GoogleTaskMaker.java b/app/src/androidTest/java/org/tasks/makers/GoogleTaskMaker.java index 09f0ee68e..bb9e923b9 100644 --- a/app/src/androidTest/java/org/tasks/makers/GoogleTaskMaker.java +++ b/app/src/androidTest/java/org/tasks/makers/GoogleTaskMaker.java @@ -15,6 +15,7 @@ public class GoogleTaskMaker { public static final Property ORDER = newProperty(); public static final Property REMOTE_ID = newProperty(); public static final Property TASK = newProperty(); + public static final Property PARENT = newProperty(); private static final Instantiator instantiator = lookup -> { GoogleTask task = new GoogleTask(); @@ -22,6 +23,7 @@ public class GoogleTaskMaker { task.setOrder(lookup.valueOf(ORDER, 0)); task.setRemoteId(lookup.valueOf(REMOTE_ID, UUIDHelper.newUUID())); task.setTask(lookup.valueOf(TASK, 1)); + task.setParent(lookup.valueOf(PARENT, 0L)); return task; };