nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixes assertions after using generics on event stores query

Browse Source
This commit is contained in:
Vitor Pamplona
2025-12-16 15:24:59 -05:00
parent eef3f42d3f
commit 2b865ab56d
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt
+12 -12
View File
@@ -24,11 +24,11 @@ import com.vitorpamplona.quartz.nip01Core.core.Event
import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
import junit.framework.TestCase import junit.framework.TestCase
fun EventStore.assertQuery( fun <T : Event> EventStore.assertQuery(
expected: Event?, expected: T?,
filter: Filter, filter: Filter,
) { ) {
val queryResult = query(filter) val queryResult = query<T>(filter)
val countResult = count(filter) val countResult = count(filter)
if (expected == null) { if (expected == null) {
TestCase.assertEquals(0, queryResult.size) TestCase.assertEquals(0, queryResult.size)
@@ -40,11 +40,11 @@ fun EventStore.assertQuery(
} }
} }
fun EventStore.assertQuery( fun <T : Event> EventStore.assertQuery(
expected: List<Event>, expected: List<T>,
filter: Filter, filter: Filter,
) { ) {
val queryResult = query(filter) val queryResult = query<T>(filter)
val countResult = count(filter) val countResult = count(filter)
TestCase.assertEquals(expected.size, queryResult.size) TestCase.assertEquals(expected.size, queryResult.size)
TestCase.assertEquals(expected.size, countResult) TestCase.assertEquals(expected.size, countResult)
@@ -53,11 +53,11 @@ fun EventStore.assertQuery(
} }
} }
fun SQLiteEventStore.assertQuery( fun <T : Event> SQLiteEventStore.assertQuery(
expected: Event?, expected: T?,
filter: Filter, filter: Filter,
) { ) {
val queryResult = query(filter) val queryResult = query<T>(filter)
val countResult = count(filter) val countResult = count(filter)
if (expected == null) { if (expected == null) {
TestCase.assertEquals(0, queryResult.size) TestCase.assertEquals(0, queryResult.size)
@@ -69,11 +69,11 @@ fun SQLiteEventStore.assertQuery(
} }
} }
fun SQLiteEventStore.assertQuery( fun <T : Event> SQLiteEventStore.assertQuery(
expected: List<Event>, expected: List<T>,
filter: Filter, filter: Filter,
) { ) {
val queryResult = query(filter) val queryResult = query<T>(filter)
val countResult = count(filter) val countResult = count(filter)
TestCase.assertEquals(expected.size, queryResult.size) TestCase.assertEquals(expected.size, queryResult.size)
TestCase.assertEquals(expected.size, countResult) TestCase.assertEquals(expected.size, countResult)
quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt
+3 -2
View File
@@ -22,6 +22,7 @@ package com.vitorpamplona.quartz.nip01Core.store.sqlite
import android.content.Context import android.content.Context
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import com.vitorpamplona.quartz.nip01Core.core.Event
import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync
@@ -203,7 +204,7 @@ class BasicTest {
db.insertEvent(comment) db.insertEvent(comment)
db.insertEvent(profile) db.insertEvent(profile)
db.query(Filter(tags = mapOf("I" to listOf("geo:drt3n")))) { event -> db.query<Event>(Filter(tags = mapOf("I" to listOf("geo:drt3n")))) { event ->
assertEquals(comment.toJson(), event.toJson()) assertEquals(comment.toJson(), event.toJson())
} }
} }
@@ -234,7 +235,7 @@ class BasicTest {
db.insertEvent(note3) db.insertEvent(note3)
val list = val list =
db.query( db.query<TextNoteEvent>(
Filter( Filter(
tags = mapOf("t" to listOf("AaAa")), tags = mapOf("t" to listOf("AaAa")),
), ),