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

Fix tests

Browse Source
pull/2075/head
Alex Baker 2 years ago
parent 67ace66204
commit 644eda1eef
7 changed files with 97 additions and 93 deletions
Show Stats Download Patch File Download Diff File

22
app/src/androidTest/java/org/tasks/caldav/CaldavSynchronizerTest.kt
Unescape Escape View File

@ -45,11 +45,11 @@ class CaldavSynchronizerTest : CaldavTest() {
@Test @Test
fun dontFetchCalendarIfCtagMatches() = runBlocking { fun dontFetchCalendarIfCtagMatches() = runBlocking {
caldavDao.insert(CaldavCalendar().apply { caldavDao.insert(CaldavCalendar(
account = this@CaldavSynchronizerTest.account.uuid account = this@CaldavSynchronizerTest.account.uuid,
ctag = "http://sabre.io/ns/sync/1" ctag = "http://sabre.io/ns/sync/1",
url = "${this@CaldavSynchronizerTest.account.url}test-shared/" url = "${this@CaldavSynchronizerTest.account.url}test-shared/",
}) ))
enqueue(OC_SHARE_PROPFIND) enqueue(OC_SHARE_PROPFIND)
sync() sync()
@ -57,12 +57,12 @@ class CaldavSynchronizerTest : CaldavTest() {
@Test @Test
fun dontFetchTaskIfEtagMatches() = runBlocking { fun dontFetchTaskIfEtagMatches() = runBlocking {
val calendar = CaldavCalendar().apply { val calendar = CaldavCalendar(
account = this@CaldavSynchronizerTest.account.uuid account = this@CaldavSynchronizerTest.account.uuid,
uuid = UUIDHelper.newUUID() uuid = UUIDHelper.newUUID(),
url = "${this@CaldavSynchronizerTest.account.url}test-shared/" url = "${this@CaldavSynchronizerTest.account.url}test-shared/",
caldavDao.insert(this) )
} caldavDao.insert(calendar)
caldavDao.insert(newCaldavTask( caldavDao.insert(newCaldavTask(
with(TASK, taskDao.insert(newTask())), with(TASK, taskDao.insert(newTask())),
with(OBJECT, "3164728546640386952.ics"), with(OBJECT, "3164728546640386952.ics"),

24
app/src/androidTest/java/org/tasks/caldav/SharingMailboxDotOrgTest.kt
Unescape Escape View File

@ -29,12 +29,12 @@ class SharingMailboxDotOrgTest : CaldavTest() {
url = server.url("/caldav/").toString() url = server.url("/caldav/").toString()
id = caldavDao.insert(this) id = caldavDao.insert(this)
} }
val calendar = CaldavCalendar().apply { val calendar = CaldavCalendar(
account = this@SharingMailboxDotOrgTest.account.uuid account = this@SharingMailboxDotOrgTest.account.uuid,
ctag = "1614876450015" ctag = "1614876450015",
url = "${this@SharingMailboxDotOrgTest.account.url}MzM/" url = "${this@SharingMailboxDotOrgTest.account.url}MzM/",
caldavDao.insert(this) )
} caldavDao.insert(calendar)
enqueue(SHARE_OWNER) enqueue(SHARE_OWNER)
sync() sync()
@ -52,12 +52,12 @@ class SharingMailboxDotOrgTest : CaldavTest() {
url = server.url("/caldav/").toString() url = server.url("/caldav/").toString()
id = caldavDao.insert(this) id = caldavDao.insert(this)
} }
val calendar = CaldavCalendar().apply { val calendar = CaldavCalendar(
account = this@SharingMailboxDotOrgTest.account.uuid account = this@SharingMailboxDotOrgTest.account.uuid,
ctag = "1614876450015" ctag = "1614876450015",
url = "${this@SharingMailboxDotOrgTest.account.url}MzM/" url = "${this@SharingMailboxDotOrgTest.account.url}MzM/",
caldavDao.insert(this) )
} caldavDao.insert(calendar)
enqueue(SHARE_OWNER) enqueue(SHARE_OWNER)
sync() sync()

48
app/src/androidTest/java/org/tasks/caldav/SharingOwncloudTest.kt
Unescape Escape View File

@ -33,12 +33,12 @@ class SharingOwncloudTest : CaldavTest() {
@Test @Test
fun calendarOwner() = runBlocking { fun calendarOwner() = runBlocking {
setupAccount("user1") setupAccount("user1")
val calendar = CaldavCalendar().apply { val calendar = CaldavCalendar(
account = this@SharingOwncloudTest.account.uuid account = this@SharingOwncloudTest.account.uuid,
ctag = "http://sabre.io/ns/sync/1" ctag = "http://sabre.io/ns/sync/1",
url = "${this@SharingOwncloudTest.account.url}test-shared/" url = "${this@SharingOwncloudTest.account.url}test-shared/",
caldavDao.insert(this) )
} caldavDao.insert(calendar)
enqueue(OC_OWNER) enqueue(OC_OWNER)
sync() sync()
@ -49,12 +49,12 @@ class SharingOwncloudTest : CaldavTest() {
@Test @Test
fun readOnly() = runBlocking { fun readOnly() = runBlocking {
setupAccount("user2") setupAccount("user2")
val calendar = CaldavCalendar().apply { val calendar = CaldavCalendar(
account = this@SharingOwncloudTest.account.uuid account = this@SharingOwncloudTest.account.uuid,
ctag = "http://sabre.io/ns/sync/2" ctag = "http://sabre.io/ns/sync/2",
url = "${this@SharingOwncloudTest.account.url}test-shared_shared_by_user1/" url = "${this@SharingOwncloudTest.account.url}test-shared_shared_by_user1/",
caldavDao.insert(this) )
} caldavDao.insert(calendar)
enqueue(OC_READ_ONLY) enqueue(OC_READ_ONLY)
sync() sync()
@ -65,12 +65,12 @@ class SharingOwncloudTest : CaldavTest() {
@Test @Test
fun principalForSharee() = runBlocking { fun principalForSharee() = runBlocking {
setupAccount("user1") setupAccount("user1")
val calendar = CaldavCalendar().apply { val calendar = CaldavCalendar(
account = this@SharingOwncloudTest.account.uuid account = this@SharingOwncloudTest.account.uuid,
ctag = "http://sabre.io/ns/sync/1" ctag = "http://sabre.io/ns/sync/1",
url = "${this@SharingOwncloudTest.account.url}test-shared/" url = "${this@SharingOwncloudTest.account.url}test-shared/",
caldavDao.insert(this) )
} caldavDao.insert(calendar)
enqueue(OC_OWNER) enqueue(OC_OWNER)
sync() sync()
@ -89,12 +89,12 @@ class SharingOwncloudTest : CaldavTest() {
@Test @Test
fun principalForOwner() = runBlocking { fun principalForOwner() = runBlocking {
setupAccount("user2") setupAccount("user2")
val calendar = CaldavCalendar().apply { val calendar = CaldavCalendar(
account = this@SharingOwncloudTest.account.uuid account = this@SharingOwncloudTest.account.uuid,
ctag = "http://sabre.io/ns/sync/2" ctag = "http://sabre.io/ns/sync/2",
url = "${this@SharingOwncloudTest.account.url}test-shared_shared_by_user1/" url = "${this@SharingOwncloudTest.account.url}test-shared_shared_by_user1/",
caldavDao.insert(this) )
} caldavDao.insert(calendar)
enqueue(OC_READ_ONLY) enqueue(OC_READ_ONLY)
sync() sync()

61
app/src/androidTest/java/org/tasks/caldav/SharingSabredavTest.kt
Unescape Escape View File

@ -35,12 +35,12 @@ class SharingSabredavTest : CaldavTest() {
@Test @Test
fun calendarOwner() = runBlocking { fun calendarOwner() = runBlocking {
setupAccount("user1") setupAccount("user1")
val calendar = CaldavCalendar().apply { val calendar = CaldavCalendar(
account = this@SharingSabredavTest.account.uuid account = this@SharingSabredavTest.account.uuid,
ctag = "http://sabre.io/ns/sync/1" ctag = "http://sabre.io/ns/sync/1",
url = "${this@SharingSabredavTest.account.url}940468858232147861/" url = "${this@SharingSabredavTest.account.url}940468858232147861/",
caldavDao.insert(this) )
} caldavDao.insert(calendar)
enqueue(SD_OWNER) enqueue(SD_OWNER)
sync() sync()
@ -54,12 +54,12 @@ class SharingSabredavTest : CaldavTest() {
@Test @Test
fun calendarSharee() = runBlocking { fun calendarSharee() = runBlocking {
setupAccount("user2") setupAccount("user2")
val calendar = CaldavCalendar().apply { val calendar = CaldavCalendar(
account = this@SharingSabredavTest.account.uuid account = this@SharingSabredavTest.account.uuid,
ctag = "http://sabre.io/ns/sync/1" ctag = "http://sabre.io/ns/sync/1",
url = "${this@SharingSabredavTest.account.url}c3853d69-cb7a-476c-a23b-30ffd70f110b/" url = "${this@SharingSabredavTest.account.url}c3853d69-cb7a-476c-a23b-30ffd70f110b/",
caldavDao.insert(this) )
} caldavDao.insert(calendar)
enqueue(SD_SHAREE) enqueue(SD_SHAREE)
sync() sync()
@ -73,12 +73,13 @@ class SharingSabredavTest : CaldavTest() {
@Test @Test
fun excludeCurrentUserPrincipalFromSharees() = runBlocking { fun excludeCurrentUserPrincipalFromSharees() = runBlocking {
setupAccount("user1") setupAccount("user1")
CaldavCalendar().apply { caldavDao.insert(
account = this@SharingSabredavTest.account.uuid CaldavCalendar(
ctag = "http://sabre.io/ns/sync/1" account = account.uuid,
url = "${this@SharingSabredavTest.account.url}940468858232147861/" ctag = "http://sabre.io/ns/sync/1",
caldavDao.insert(this) url = "${account.url}940468858232147861/",
} )
)
enqueue(SD_OWNER) enqueue(SD_OWNER)
sync() sync()
@ -89,12 +90,12 @@ class SharingSabredavTest : CaldavTest() {
@Test @Test
fun principalForSharee() = runBlocking { fun principalForSharee() = runBlocking {
setupAccount("user1") setupAccount("user1")
val calendar = CaldavCalendar().apply { val calendar = CaldavCalendar(
account = this@SharingSabredavTest.account.uuid account = this@SharingSabredavTest.account.uuid,
ctag = "http://sabre.io/ns/sync/1" ctag = "http://sabre.io/ns/sync/1",
url = "${this@SharingSabredavTest.account.url}940468858232147861/" url = "${this@SharingSabredavTest.account.url}940468858232147861/",
caldavDao.insert(this) )
} caldavDao.insert(calendar)
enqueue(SD_OWNER) enqueue(SD_OWNER)
sync() sync()
@ -111,12 +112,12 @@ class SharingSabredavTest : CaldavTest() {
@Test @Test
fun principalForOwner() = runBlocking { fun principalForOwner() = runBlocking {
setupAccount("user2") setupAccount("user2")
val calendar = CaldavCalendar().apply { val calendar = CaldavCalendar(
account = this@SharingSabredavTest.account.uuid account = this@SharingSabredavTest.account.uuid,
ctag = "http://sabre.io/ns/sync/1" ctag = "http://sabre.io/ns/sync/1",
url = "${this@SharingSabredavTest.account.url}c3853d69-cb7a-476c-a23b-30ffd70f110b/" url = "${this@SharingSabredavTest.account.url}c3853d69-cb7a-476c-a23b-30ffd70f110b/",
caldavDao.insert(this) )
} caldavDao.insert(calendar)
enqueue(SD_SHAREE) enqueue(SD_SHAREE)
sync() sync()

10
app/src/androidTest/java/org/tasks/opentasks/OpenTasksSynchronizerTest.kt
Unescape Escape View File

@ -64,10 +64,12 @@ class OpenTasksSynchronizerTest : OpenTasksTest() {
@Test @Test
fun removeMissingLists() = runBlocking { fun removeMissingLists() = runBlocking {
val (_, list) = openTaskDao.insertList(url = "url1") val (_, list) = openTaskDao.insertList(url = "url1")
caldavDao.insert(CaldavCalendar().apply { caldavDao.insert(
account = list.account CaldavCalendar(
url = "url2" account = list.account,
}) url = "url2",
)
)
synchronizer.sync() synchronizer.sync()

15
app/src/androidTest/java/org/tasks/opentasks/TestOpenTaskDao.kt
Unescape Escape View File

@ -35,13 +35,14 @@ class TestOpenTaskDao @Inject constructor(
.withValue(TaskContract.TaskListColumns.LIST_NAME, name) .withValue(TaskContract.TaskListColumns.LIST_NAME, name)
.withValue(TaskContract.TaskLists.SYNC_ENABLED, "1") .withValue(TaskContract.TaskLists.SYNC_ENABLED, "1")
) )
return Pair(result.uri!!.lastPathSegment!!.toLong(), CaldavCalendar().apply { val calendar = CaldavCalendar(
uuid = UUIDHelper.newUUID() uuid = UUIDHelper.newUUID(),
this.name = name name = name,
this.account = "$type:$account" account = "$type:$account",
this.url = url url = url,
caldavDao.insert(this) )
}) caldavDao.insert(calendar)
return Pair(result.uri!!.lastPathSegment!!.toLong(), calendar)
} }
fun insertTask(listId: Long, vtodo: String) { fun insertTask(listId: Long, vtodo: String) {

10
app/src/test/java/org/tasks/makers/CaldavCalendarMaker.kt
Unescape Escape View File

@ -11,11 +11,11 @@ object CaldavCalendarMaker {
val ACCOUNT: Property<CaldavCalendar, String> = newProperty() val ACCOUNT: Property<CaldavCalendar, String> = newProperty()
val UUID: Property<CaldavCalendar, String> = newProperty() val UUID: Property<CaldavCalendar, String> = newProperty()
private val instantiator = Instantiator<CaldavCalendar> { lookup -> private val instantiator = Instantiator { lookup ->
val calendar = CaldavCalendar() CaldavCalendar(
calendar.account = lookup.valueOf(ACCOUNT, "account") account = lookup.valueOf(ACCOUNT, "account"),
calendar.uuid = lookup.valueOf(UUID, "uuid") uuid = lookup.valueOf(UUID, "uuid"),
calendar )
} }
fun newCaldavCalendar(vararg properties: PropertyValue<in CaldavCalendar?, *>): CaldavCalendar { fun newCaldavCalendar(vararg properties: PropertyValue<in CaldavCalendar?, *>): CaldavCalendar {

Write Preview
Loading…
Cancel
Save