Skip to content
This repository was archived by the owner on Dec 20, 2025. It is now read-only.

test(cats-sql): actually execute groovy tests #6356

Merged
mergify merged 1 commit into from
Mar 8, 2025
Merged

test(cats-sql): actually execute groovy tests #6356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions cats/cats-sql/cats-sql.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,7 @@ dependencies {
testImplementation "com.mysql:mysql-connector-j"
testImplementation "org.postgresql:postgresql"
}

test {
useJUnitPlatform()
}
3 changes: 1 addition & 2 deletions cats/cats-sql/src/test/groovy/com/netflix/spinnaker/cats/sql/MySqlCacheSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import com.netflix.spinnaker.cats.cache.Cache
import com.netflix.spinnaker.cats.cache.WriteableCache
import com.netflix.spinnaker.cats.sql.cache.SqlCache
import com.netflix.spinnaker.cats.sql.cache.SqlCacheMetrics
import com.netflix.spinnaker.cats.sql.cache.SqlNamedCacheFactory
import com.netflix.spinnaker.config.SqlConstraintsInitializer
import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService
import com.netflix.spinnaker.kork.sql.config.RetryProperties
Expand All @@ -42,7 +41,7 @@ class MySqlCacheSpec extends SqlCacheSpec {
@Override
Cache getSubject() {
def mapper = new ObjectMapper()
def clock = new Clock.FixedClock(Instant.EPOCH, ZoneId.of("UTC"))
def clock = Clock.fixed(Instant.EPOCH, ZoneId.of("UTC"))
def sqlRetryProperties = new SqlRetryProperties(new RetryProperties(1, 10), new RetryProperties(1, 10))

def dynamicConfigService = Mock(DynamicConfigService) {
Expand Down
2 changes: 1 addition & 1 deletion cats/cats-sql/src/test/groovy/com/netflix/spinnaker/cats/sql/PostgreSqlCacheSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class PostgreSqlCacheSpec extends SqlCacheSpec {
@Override
Cache getSubject() {
def mapper = new ObjectMapper()
def clock = new Clock.FixedClock(Instant.EPOCH, ZoneId.of("UTC"))
def clock = Clock.fixed(Instant.EPOCH, ZoneId.of("UTC"))
def sqlRetryProperties = new SqlRetryProperties(new RetryProperties(1, 10), new RetryProperties(1, 10))

def dynamicConfigService = Mock(DynamicConfigService) {
Expand Down
2 changes: 1 addition & 1 deletion cats/cats-sql/src/test/groovy/com/netflix/spinnaker/cats/sql/SqlProviderCacheSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class SqlProviderCacheSpec extends ProviderCacheSpec {
@Override
Cache getSubject() {
def mapper = new ObjectMapper()
def clock = new Clock.FixedClock(Instant.EPOCH, ZoneId.of("UTC"))
def clock = Clock.fixed(Instant.EPOCH, ZoneId.of("UTC"))
def sqlRetryProperties = new SqlRetryProperties(new RetryProperties(1, 10), new RetryProperties(1, 10))
def sqlMetrics = new SpectatorSqlCacheMetrics(new NoopRegistry())
def dynamicConfigService = Mock(DynamicConfigService) {
Expand Down
Loading