From 08a3e40d46fbd6f554d073f725414c0204bbb729 Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Thu, 16 Sep 2021 12:29:41 +0200 Subject: [PATCH] Update unit test --- .../java/org/pixeldroid/app/APIUnitTest.kt | 51 ++----------------- .../java/org/pixeldroid/app/PostUnitTest.kt | 9 ++-- 2 files changed, 8 insertions(+), 52 deletions(-) diff --git a/app/src/test/java/org/pixeldroid/app/APIUnitTest.kt b/app/src/test/java/org/pixeldroid/app/APIUnitTest.kt index 77cea6c6..887c31ab 100644 --- a/app/src/test/java/org/pixeldroid/app/APIUnitTest.kt +++ b/app/src/test/java/org/pixeldroid/app/APIUnitTest.kt @@ -8,58 +8,15 @@ import kotlinx.coroutines.runBlocking import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test -import java.time.OffsetDateTime +import java.time.Instant /** - * Example local unit test, which will execute on the development machine (host). + * Unit test, which will execute on the development machine (host). * * See [testing documentation](http://d.android.com/tools/testing). */ class APIUnitTest { - private val referenceFirstStatus = Status(id="140364967936397312", uri="https://pixelfed.de/p/Miike/140364967936397312", - created_at= OffsetDateTime.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=null, - created_at="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="", - media_attachments= listOf(Attachment(id="15888", type= Attachment.AttachmentType.image, url="https://pixelfed.de/storage/m/113a3e2124a33b1f5511e531953f5ee48456e0c7/34dd6d9fb1762dac8c7ddeeaf789d2d8fa083c9f/JtjO0eAbELpgO1UZqF5ydrKbCKRVyJUM1WAaqIeB.jpeg", - preview_url="https://pixelfed.de/storage/m/113a3e2124a33b1f5511e531953f5ee48456e0c7/34dd6d9fb1762dac8c7ddeeaf789d2d8fa083c9f/JtjO0eAbELpgO1UZqF5ydrKbCKRVyJUM1WAaqIeB_thumb.jpeg", - remote_url=null, text_url=null, description=null, blurhash=null, meta = null)), - application= Application(name="web", website=null, vapid_key=null), mentions=emptyList(), - tags= listOf(Tag(name="hiking", url="https://pixelfed.de/discover/tags/hiking", history=null), Tag(name="nature", url="https://pixelfed.de/discover/tags/nature", history=null), Tag(name="rotavicentina", url="https://pixelfed.de/discover/tags/rotavicentina", history=null)), - emojis= emptyList(), reblogs_count=0, favourites_count=0, replies_count=0, url="https://pixelfed.de/p/Miike/140364967936397312", - in_reply_to_id=null, in_reply_to_account=null, reblog=null, poll=null, card=null, language=null, text=null, favourited=null, reblogged=null, muted=null, bookmarked=null, pinned=null) - val sampleNotification = Notification("45723", Notification.NotificationType.favourite, - OffsetDateTime.parse("2020-03-14T15:01:49+00:00")!!, - Account("79574199701737472", "Spaziergaenger", - "Spaziergaenger", "https://pixelfed.de/Spaziergaenger", - "anonymous", "", "https://pixelfed.de/storage/avatars/007/957/419/970/173/747/2/KEg4YgCgsmzdgyVztszz_avatar.jpeg?v=d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35", - "https://pixelfed.de/storage/avatars/007/957/419/970/173/747/2/KEg4YgCgsmzdgyVztszz_avatar.jpeg?v=d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35", - locked=false, followers_count = 40, following_count = 0, statuses_count = 891, created_at = "1568728767", header = "", discoverable = true, emojis = emptyList(), header_static = ""), - Status("144456497894658048","https://pixelfed.de/p/dante/144456497894658048", - OffsetDateTime.parse("2020-03-03T08:00:16+00:00"), in_reply_to_id = null, - in_reply_to_account = null, reblog = null,content = "Saturn V launch", emojis = emptyList(), reblogs_count = 0, - favourites_count = 1, reblogged = false, favourited = false, muted = false, sensitive = false, - spoiler_text = "", visibility = Status.Visibility.public, application = Application("web", null), - language = null, pinned = false, mentions = emptyList(), tags = emptyList(), replies_count = 0, - account = Account("136453537340198912", "dante", "dante", locked = false, following_count = 3, - followers_count = 1,statuses_count = 1, note = "", url = "https://pixelfed.de/dante", - avatar = "https://pixelfed.de/storage/avatars/default.png?v=5feceb66ffc86f38d952786c6d696c79c2dbc239dd4e91b46729d73a27fb57e9", - emojis = emptyList(), header_static = "", header = "", created_at = "1582289858", avatar_static = "https://pixelfed.de/storage/avatars/default.png?v=5feceb66ffc86f38d952786c6d696c79c2dbc239dd4e91b46729d73a27fb57e9", - discoverable = true, display_name = "Dante"), media_attachments = listOf( - Attachment("16583",Attachment.AttachmentType.image, "https://pixelfed.de/storage/m/113a3e2124a33b1f5511e531953f5ee48456e0c7/0fa8bbe19cc23442034913a7c97fbe4527c1d63a/vs2vouJ86OvzxhK9ewhPlfPf4Y9IoQ5CHfiBIqad.jpeg", - "https://pixelfed.de/storage/m/113a3e2124a33b1f5511e531953f5ee48456e0c7/0fa8bbe19cc23442034913a7c97fbe4527c1d63a/vs2vouJ86OvzxhK9ewhPlfPf4Y9IoQ5CHfiBIqad_thumb.jpeg", - null, null, null, null) - ) - , bookmarked = false, card = null, poll = null, text= null,url= "https://pixelfed.de/p/dante/144456497894658048") - , user_id = "", instance_uri = "" - ) @get:Rule var wireMockRule = WireMockRule(8089) @@ -163,12 +120,12 @@ fun assertStatusEqualsToReference(actual: Status){ assert( ((actual.id=="140364967936397312" && actual.uri=="https://pixelfed.de/p/Miike/140364967936397312" - && actual.created_at == OffsetDateTime.parse("2020-03-03T08:00:16.+00:00") + && actual.created_at == Instant.parse("2020-03-03T08:00:16.+00:00") && actual.account!!.id=="115114166443970560"&& actual.account!!.username=="Miike"&& actual.account!!.acct=="Miike" && actual.account!!.url=="https://pixelfed.de/Miike"&& actual.account!!.display_name=="Miike Duart"&& actual.account!!.note==""&& //actual.account!!.avatar=="https://pixelfed.de/storage/avatars/011/511/416/644/397/056/0/ZhaopLJWTWJ3hsVCS5pS_avatar.png?v=d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35"&& //actual.account!!.avatar_static=="https://pixelfed.de/storage/avatars/011/511/416/644/397/056/0/ZhaopLJWTWJ3hsVCS5pS_avatar.png?v=d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35"&& - actual.account!!.header==""&& actual.account!!.header_static=="") && !actual.account!!.locked!! && actual.account!!.emojis== emptyList() && actual.account!!.discoverable == null && actual.account!!.created_at=="2019-12-24T15:42:35.000000Z" && actual.account!!.statuses_count==71 && actual.account!!.followers_count==14 && actual.account!!.following_count==0 && actual.account!!.moved==null && actual.account!!.fields==null && !actual.account!!.bot!! && actual.account!!.source==null && actual.content == """Day 8 #rotavicentina #hiking #nature""" && actual.visibility==Status.Visibility.public) && !actual.sensitive!! && actual.spoiler_text=="" + actual.account!!.header==""&& actual.account!!.header_static=="") && !actual.account!!.locked!! && actual.account!!.emojis== emptyList() && actual.account!!.discoverable == null && actual.account!!.created_at==Instant.parse("2019-12-24T15:42:35.000000Z") && actual.account!!.statuses_count==71 && actual.account!!.followers_count==14 && actual.account!!.following_count==0 && actual.account!!.moved==null && actual.account!!.fields==null && !actual.account!!.bot!! && actual.account!!.source==null && actual.content == """Day 8 #rotavicentina #hiking #nature""" && actual.visibility==Status.Visibility.public) && !actual.sensitive!! && actual.spoiler_text=="" ) val attchmnt = actual.media_attachments!![0] assert(attchmnt.id == "15888" && attchmnt.type == Attachment.AttachmentType.image && attchmnt.url=="https://pixelfed.de/storage/m/113a3e2124a33b1f5511e531953f5ee48456e0c7/34dd6d9fb1762dac8c7ddeeaf789d2d8fa083c9f/JtjO0eAbELpgO1UZqF5ydrKbCKRVyJUM1WAaqIeB.jpeg" && diff --git a/app/src/test/java/org/pixeldroid/app/PostUnitTest.kt b/app/src/test/java/org/pixeldroid/app/PostUnitTest.kt index a453e3d4..0978fda4 100644 --- a/app/src/test/java/org/pixeldroid/app/PostUnitTest.kt +++ b/app/src/test/java/org/pixeldroid/app/PostUnitTest.kt @@ -1,20 +1,19 @@ package org.pixeldroid.app -import org.pixeldroid.app.utils.api.objects.* import org.junit.Assert import org.junit.Test -import java.text.SimpleDateFormat -import java.time.OffsetDateTime +import org.pixeldroid.app.utils.api.objects.* +import java.time.Instant class PostUnitTest { private 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="",