diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorInstanceRelationshipRepositoryTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorInstanceRelationshipRepositoryTest.kt index 2e863a1f..6ed40eb6 100644 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorInstanceRelationshipRepositoryTest.kt +++ b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorInstanceRelationshipRepositoryTest.kt @@ -40,18 +40,7 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac execute(Operations.sql("SET REFERENTIAL_INTEGRITY FALSE")) insertInto(Instance.tableName) { columns( - "ID", - "name", - "DESCRIPTION", - "URL", - "ICON_URL", - "SHARED_INBOX", - "SOFTWARE", - "VERSION", - "IS_BLOCKED", - "IS_MUTED", - "MODERATION_NOTE", - "CREATED_AT" + Instance.columns ) values( 1, @@ -70,33 +59,7 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac } insertInto("public.actors") { columns( - "id", - "name", - "domain", - "screen_name", - "description", - "inbox", - "outbox", - "url", - "public_key", - "private_key", - "created_at", - "key_id", - "following", - "followers", - "instance", - "locked", - "following_count", - "followers_count", - "posts_count", - "last_post_at", - "last_update_at", - "suspend", - "move_to", - "emojis", - "deleted", - "icon", - "banner" + Actors.columns ) values( 1, @@ -153,18 +116,7 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac execute(Operations.sql("SET REFERENTIAL_INTEGRITY FALSE")) insertInto(Instance.tableName) { columns( - "ID", - "name", - "DESCRIPTION", - "URL", - "ICON_URL", - "SHARED_INBOX", - "SOFTWARE", - "VERSION", - "IS_BLOCKED", - "IS_MUTED", - "MODERATION_NOTE", - "CREATED_AT" + Instance.columns ) values( 1, @@ -183,33 +135,7 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac } insertInto("public.actors") { columns( - "id", - "name", - "domain", - "screen_name", - "description", - "inbox", - "outbox", - "url", - "public_key", - "private_key", - "created_at", - "key_id", - "following", - "followers", - "instance", - "locked", - "following_count", - "followers_count", - "posts_count", - "last_post_at", - "last_update_at", - "suspend", - "move_to", - "emojis", - "deleted", - "icon", - "banner" + Actors.columns ) values( 1, diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImplTest.kt index 8955aca5..ec30240f 100644 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImplTest.kt +++ b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImplTest.kt @@ -8,6 +8,7 @@ import org.assertj.db.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import utils.AbstractRepositoryTest +import utils.columns import utils.isEqualTo import utils.value import java.net.URI @@ -56,18 +57,7 @@ class InstanceRepositoryImplTest : AbstractRepositoryTest(InstanceTable) { dbSetup(to = dataSource) { insertInto(InstanceTable.tableName) { columns( - "ID", - "name", - "DESCRIPTION", - "URL", - "ICON_URL", - "SHARED_INBOX", - "SOFTWARE", - "VERSION", - "IS_BLOCKED", - "IS_MUTED", - "MODERATION_NOTE", - "CREATED_AT" + InstanceTable.columns ) values( 1, @@ -119,18 +109,7 @@ class InstanceRepositoryImplTest : AbstractRepositoryTest(InstanceTable) { dbSetup(to = dataSource) { insertInto(InstanceTable.tableName) { columns( - "ID", - "name", - "DESCRIPTION", - "URL", - "ICON_URL", - "SHARED_INBOX", - "SOFTWARE", - "VERSION", - "IS_BLOCKED", - "IS_MUTED", - "MODERATION_NOTE", - "CREATED_AT" + InstanceTable.columns ) values( 1, @@ -178,18 +157,7 @@ class InstanceRepositoryImplTest : AbstractRepositoryTest(InstanceTable) { dbSetup(to = dataSource) { insertInto(InstanceTable.tableName) { columns( - "ID", - "name", - "DESCRIPTION", - "URL", - "ICON_URL", - "SHARED_INBOX", - "SOFTWARE", - "VERSION", - "IS_BLOCKED", - "IS_MUTED", - "MODERATION_NOTE", - "CREATED_AT" + InstanceTable.columns ) values( 1, @@ -237,18 +205,7 @@ class InstanceRepositoryImplTest : AbstractRepositoryTest(InstanceTable) { dbSetup(to = dataSource) { insertInto(InstanceTable.tableName) { columns( - "ID", - "name", - "DESCRIPTION", - "URL", - "ICON_URL", - "SHARED_INBOX", - "SOFTWARE", - "VERSION", - "IS_BLOCKED", - "IS_MUTED", - "MODERATION_NOTE", - "CREATED_AT" + InstanceTable.columns ) values( 1,