From 9e0ab70320be943f1e74f12c10a988ba3ba620b4 Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Sat, 11 Sep 2021 15:10:34 +0200 Subject: [PATCH] Update tests --- .../java/org/pixeldroid/app/IntentTest.kt | 5 +++-- .../java/org/pixeldroid/app/PostTest.kt | 17 +++++++++-------- .../java/org/pixeldroid/app/ProfileTest.kt | 3 ++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/src/androidTest/java/org/pixeldroid/app/IntentTest.kt b/app/src/androidTest/java/org/pixeldroid/app/IntentTest.kt index 7b29e396..6f312031 100644 --- a/app/src/androidTest/java/org/pixeldroid/app/IntentTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/IntentTest.kt @@ -30,6 +30,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.Timeout import org.junit.runner.RunWith +import java.time.Instant @RunWith(AndroidJUnit4::class) @@ -73,12 +74,12 @@ class IntentTest { "https://testing2.pixeldroid.org/storage/avatars/default.jpg?v=0", "https://testing2.pixeldroid.org/storage/avatars/default.jpg?v=0", "", "", false, emptyList(), null, - "2021-02-11T23:44:03.000000Z", 0, 1, 2, + Instant.parse("2021-02-11T23:44:03.000000Z"), 0, 1, 2, null, null, false, null) val expectedIntent: Matcher = CoreMatchers.allOf( IntentMatchers.hasExtra(ACCOUNT_TAG, account) ) - + "2021-02-11T23:44:03.000000Z" waitForView(R.id.description) //Click the mention diff --git a/app/src/androidTest/java/org/pixeldroid/app/PostTest.kt b/app/src/androidTest/java/org/pixeldroid/app/PostTest.kt index fc8ad285..844742f8 100644 --- a/app/src/androidTest/java/org/pixeldroid/app/PostTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/PostTest.kt @@ -27,6 +27,7 @@ import org.junit.* import org.junit.rules.Timeout import org.junit.runner.RunWith import java.text.SimpleDateFormat +import java.time.Instant import java.time.OffsetDateTime @@ -68,7 +69,7 @@ class PostTest { url = "$INSTANCE_URI/pixeldroid", ), media_attachments = listOf(attachment), - created_at = OffsetDateTime.now().minusHours(1) + created_at = Instant.now().minusSeconds(3600) ) val intent = Intent(context, PostActivity::class.java) intent.putExtra(Status.POST_TAG, post) @@ -105,7 +106,7 @@ class PostTest { url = "$INSTANCE_URI/pixeldroid", ), media_attachments = listOf(attachment1, attachment2), - created_at = OffsetDateTime.now().minusHours(1) + created_at = Instant.now().minusSeconds(3600) ) val intent = Intent(context, PostActivity::class.java) intent.putExtra(Status.POST_TAG, post) @@ -138,7 +139,7 @@ class PostTest { url = "$INSTANCE_URI/pixeldroid", ), media_attachments = listOf(attachment), - created_at = OffsetDateTime.now().minusHours(1) + created_at = Instant.now().minusSeconds(3600) ) val intent = Intent(context, PostActivity::class.java) intent.putExtra(Status.POST_TAG, post) @@ -170,7 +171,7 @@ class PostTest { url = "$INSTANCE_URI/pixeldroid", ), media_attachments = listOf(attachment1, attachment2), - created_at = OffsetDateTime.now().minusHours(1) + created_at = Instant.now().minusSeconds(3600) ) val intent = Intent(context, PostActivity::class.java) intent.putExtra(Status.POST_TAG, post) @@ -186,13 +187,13 @@ class PostTest { @Test fun getNLikesReturnsCorrectFormat() { val status = Status(id="140364967936397312", uri="https://pixelfed.de/p/Miike/140364967936397312", - created_at= OffsetDateTime.parse("2020-03-03T08:00:16+00:00"), + created_at= Instant.parse("2020-03-03T08:00:16+00:00"), account= Account(id="115114166443970560", username="Miike", acct="Miike", url="https://pixelfed.de/Miike", display_name="Miike Duart", note="", avatar="https://pixelfed.de/storage/avatars/011/511/416/644/397/056/0/ZhaopLJWTWJ3hsVCS5pS_avatar.png?v=d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35", avatar_static="https://pixelfed.de/storage/avatars/011/511/416/644/397/056/0/ZhaopLJWTWJ3hsVCS5pS_avatar.png?v=d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35", header="", header_static="", locked=false, emojis= emptyList(), discoverable=false, - created_at="2019-12-24T15:42:35.000000Z", statuses_count=71, followers_count=14, + created_at=Instant.parse("2019-12-24T15:42:35.000000Z"), statuses_count=71, followers_count=14, following_count=0, moved=null, fields=null, bot=false, source=null), content="""Day 8 #rotavicentina #hiking #nature""", visibility=Status.Visibility.public, sensitive=false, spoiler_text="", @@ -213,13 +214,13 @@ class PostTest { @Test fun getNSharesReturnsCorrectFormat() { val status = Status(id="140364967936397312", uri="https://pixelfed.de/p/Miike/140364967936397312", - created_at= OffsetDateTime.parse("2020-03-03T08:00:16+00:00"), + created_at= Instant.parse("2020-03-03T08:00:16+00:00"), account= Account(id="115114166443970560", username="Miike", acct="Miike", url="https://pixelfed.de/Miike", display_name="Miike Duart", note="", avatar="https://pixelfed.de/storage/avatars/011/511/416/644/397/056/0/ZhaopLJWTWJ3hsVCS5pS_avatar.png?v=d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35", avatar_static="https://pixelfed.de/storage/avatars/011/511/416/644/397/056/0/ZhaopLJWTWJ3hsVCS5pS_avatar.png?v=d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35", header="", header_static="", locked=false, emojis= emptyList(), discoverable=false, - created_at="2019-12-24T15:42:35.000000Z", statuses_count=71, followers_count=14, + created_at=Instant.parse("2019-12-24T15:42:35.000000Z"), statuses_count=71, followers_count=14, following_count=0, moved=null, fields=null, bot=false, source=null), content="""Day 8 #rotavicentina #hiking #nature""", visibility=Status.Visibility.public, sensitive=false, spoiler_text="", diff --git a/app/src/androidTest/java/org/pixeldroid/app/ProfileTest.kt b/app/src/androidTest/java/org/pixeldroid/app/ProfileTest.kt index 778a3946..935063f7 100644 --- a/app/src/androidTest/java/org/pixeldroid/app/ProfileTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/ProfileTest.kt @@ -19,6 +19,7 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import java.time.Instant @RunWith(AndroidJUnit4::class) class ProfileTest { @@ -37,7 +38,7 @@ class ProfileTest { db.close() val intent = Intent(context, ProfileActivity::class.java) - val account = Account(id = "265472486651596800", username = "pixeldroid", acct = "pixeldroid", url = "https://testing2.pixeldroid.org/pixeldroid", display_name = "PixelDroid Developer", avatar = "https://testing2.pixeldroid.org/storage/avatars/default.jpg?v=0", avatar_static = "https://testing2.pixeldroid.org/storage/avatars/default.jpg?v=0", locked = false, emojis = arrayListOf(), discoverable = null, created_at = "2021-02-11T13:32:53.000000Z", statuses_count = 1, followers_count = 1, following_count = 1, moved = null, fields = null, bot = false, source = null) + val account = Account(id = "265472486651596800", username = "pixeldroid", acct = "pixeldroid", url = "https://testing2.pixeldroid.org/pixeldroid", display_name = "PixelDroid Developer", avatar = "https://testing2.pixeldroid.org/storage/avatars/default.jpg?v=0", avatar_static = "https://testing2.pixeldroid.org/storage/avatars/default.jpg?v=0", locked = false, emojis = arrayListOf(), discoverable = null, created_at = Instant.parse("2021-02-11T13:32:53.000000Z"), statuses_count = 1, followers_count = 1, following_count = 1, moved = null, fields = null, bot = false, source = null) intent.putExtra(Account.ACCOUNT_TAG, account) activityScenario = ActivityScenario.launch(intent) onView(withId(R.id.profileRefreshLayout)).perform(swipeDown())