Skip to content

fix(deps): update dependency org.testcontainers:testcontainers-bom to v2 #2052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renovate wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix(deps): update dependency org.testcontainers:testcontainers-bom to v2 #2052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd37f3b
fix(deps): update dependency org.testcontainers:testcontainers-bom to v2
renovate[bot] Oct 15, 2025
01da21c
Merge branch 'main' into renovate/major-testcontainers-java-monorepo
Ahoo-Wang Oct 15, 2025
e59d245
test(eventsourcing): refactor assertions in StateAggregateRepositorySpec
Ahoo-Wang Oct 15, 2025
61789b0
test(elasticsearch): refactor test assertions for projection converter
Ahoo-Wang Oct 15, 2025
097795b
test(elasticsearch): refactor sort converter tests with assert library
Ahoo-Wang Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cosid = "2.13.3"
simba = "2.9.6"
coapi = "1.12.8"
cocache = "3.10.3"
testcontainers = "1.21.3"
testcontainers = "2.0.0"
opentelemetry = "1.55.0"
opentelemetry-instrumentation = "2.20.1"
opentelemetry-semconv = "1.29.0-alpha"
Expand Down
30 changes: 11 additions & 19 deletions test/wow-tck/src/main/kotlin/me/ahoo/wow/tck/eventsourcing/StateAggregateRepositorySpec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ import me.ahoo.wow.tck.mock.MockAggregateChanged
import me.ahoo.wow.tck.mock.MockCommandAggregate
import me.ahoo.wow.tck.mock.MockStateAggregate
import me.ahoo.wow.test.aggregate.GivenInitializationCommand
import org.hamcrest.MatcherAssert
import org.hamcrest.Matchers
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
import reactor.kotlin.test.test
Expand All @@ -61,14 +59,11 @@ abstract class StateAggregateRepositorySpec {
stateAggregate.assert().isNotNull()
stateAggregate.aggregateId.assert().isEqualTo(aggregateId)
val domainEventMessage = eventStream.iterator().next() as DomainEvent<MockAggregateChanged>
MatcherAssert.assertThat(stateAggregate.version, Matchers.equalTo(domainEventMessage.version))
MatcherAssert.assertThat(
stateAggregate.state.data,
Matchers.equalTo(domainEventMessage.body.data),
)
stateAggregate.version.assert().isEqualTo(domainEventMessage.version)
stateAggregate.state.data.assert().isEqualTo(domainEventMessage.body.data)

val stateAggregate1 = aggregateRepository.load<MockStateAggregate>(aggregateId, tailVersion = 1).block()!!
MatcherAssert.assertThat(stateAggregate1.version, Matchers.equalTo(domainEventMessage.version))
stateAggregate1.version.assert().isEqualTo(domainEventMessage.version)
}

@Suppress("UNCHECKED_CAST")
Expand All @@ -82,20 +77,17 @@ abstract class StateAggregateRepositorySpec {
val eventStream = stateChanged.toDomainEventStream(upstream = command, aggregateVersion = 0)
TEST_EVENT_STORE.append(eventStream).block()
val stateAggregate = aggregateRepository.load(aggregateId, aggregateMetadata.state).block()!!
MatcherAssert.assertThat(stateAggregate, Matchers.notNullValue())
MatcherAssert.assertThat(stateAggregate.aggregateId, Matchers.equalTo(aggregateId))
stateAggregate.version.assert().isNotNull()
stateAggregate.aggregateId.assert().isEqualTo(aggregateId)
val domainEventMessage = eventStream.iterator().next() as DomainEvent<MockAggregateChanged>
MatcherAssert.assertThat(stateAggregate.version, Matchers.equalTo(domainEventMessage.version))
MatcherAssert.assertThat(
stateAggregate.state.data,
Matchers.equalTo(domainEventMessage.body.data),
)
stateAggregate.version.assert().isEqualTo(domainEventMessage.version)
stateAggregate.state.data.assert().isEqualTo(domainEventMessage.body.data)

val stateAggregate1 = aggregateRepository.load<MockStateAggregate>(
aggregateId,
tailEventTime = domainEventMessage.createTime
).block()!!
MatcherAssert.assertThat(stateAggregate1.version, Matchers.equalTo(domainEventMessage.version))
stateAggregate1.version.assert().isEqualTo(domainEventMessage.version)
}

@Test
Expand All @@ -105,7 +97,7 @@ abstract class StateAggregateRepositorySpec {
aggregateRepository.load(aggregateId, aggregateMetadata.state)
.test()
.consumeNextWith {
MatcherAssert.assertThat(it.initialized, Matchers.equalTo(false))
it.initialized.assert().isFalse()
}
.verifyComplete()
}
Expand Down Expand Up @@ -138,8 +130,8 @@ abstract class StateAggregateRepositorySpec {
aggregateRepository.load(aggregateId, aggregateMetadata.state)
.test()
.assertNext { stateAggregate: StateAggregate<MockStateAggregate> ->
MatcherAssert.assertThat(stateAggregate.initialized, Matchers.equalTo(true))
MatcherAssert.assertThat(stateAggregate.version, Matchers.equalTo(1))
stateAggregate.initialized.assert().isTrue()
stateAggregate.version.assert().isOne()
}
.verifyComplete()
}
Expand Down
4 changes: 1 addition & 3 deletions test/wow-tck/src/main/kotlin/me/ahoo/wow/tck/query/SnapshotQueryServiceSpec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ import me.ahoo.wow.query.snapshot.dynamicQuery
import me.ahoo.wow.query.snapshot.query
import me.ahoo.wow.tck.mock.MOCK_AGGREGATE_METADATA
import me.ahoo.wow.tck.mock.MockStateAggregate
import org.hamcrest.CoreMatchers.sameInstance
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import reactor.kotlin.test.test
Expand Down Expand Up @@ -66,7 +64,7 @@ abstract class SnapshotQueryServiceSpec {
fun createFromCache() {
val queryService1 = snapshotQueryServiceFactory.create<MockStateAggregate>(MOCK_AGGREGATE_METADATA)
val queryService2 = snapshotQueryServiceFactory.create<MockStateAggregate>(MOCK_AGGREGATE_METADATA)
assertThat(queryService1, sameInstance(queryService2))
queryService1.assert().isSameAs(queryService2)
}

@Test
Expand Down
7 changes: 3 additions & 4 deletions ...h/src/test/kotlin/me/ahoo/wow/elasticsearch/query/ElasticsearchProjectionConverterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@

package me.ahoo.wow.elasticsearch.query

import me.ahoo.test.asserts.assert
import me.ahoo.wow.elasticsearch.query.ElasticsearchProjectionConverter.toSourceFilter
import me.ahoo.wow.query.dsl.projection
import org.hamcrest.CoreMatchers.hasItem
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Test

class ElasticsearchProjectionConverterTest {
Expand All @@ -28,7 +27,7 @@ class ElasticsearchProjectionConverterTest {
}

val sourceFilter = projection.toSourceFilter()
assertThat(sourceFilter.includes(), hasItem("field1"))
assertThat(sourceFilter.excludes(), hasItem("field2"))
sourceFilter.includes().assert().contains("field1")
sourceFilter.excludes().assert().contains("field2")
}
}
11 changes: 5 additions & 6 deletions ...csearch/src/test/kotlin/me/ahoo/wow/elasticsearch/query/ElasticsearchSortConverterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
package me.ahoo.wow.elasticsearch.query

import co.elastic.clients.elasticsearch._types.SortOrder
import me.ahoo.test.asserts.assert
import me.ahoo.wow.api.query.Sort
import me.ahoo.wow.elasticsearch.query.ElasticsearchSortConverter.toSortOptions
import me.ahoo.wow.query.dsl.sort
import org.hamcrest.CoreMatchers.equalTo
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test

Expand All @@ -34,12 +33,12 @@ class ElasticsearchSortConverterTest {
val actual = sort.toSortOptions()

actual.first().let {
assertThat(it.field().field(), equalTo("field1"))
assertThat(it.field().order(), equalTo(SortOrder.Asc))
it.field().field().assert().isEqualTo("field1")
it.field().order().assert().isEqualTo(SortOrder.Asc)
}
actual.last().let {
assertThat(it.field().field(), equalTo("field2"))
assertThat(it.field().order(), equalTo(SortOrder.Desc))
it.field().field().assert().isEqualTo("field2")
it.field().order().assert().isEqualTo(SortOrder.Desc)
}
}

Expand Down
Loading