Skip to content

Commit

Permalink
fix: fix itest issues
Browse files Browse the repository at this point in the history
Fixes #852
  • Loading branch information
Lars Bilger committed Sep 11, 2023
1 parent 8537828 commit 26aca30
Show file tree
Hide file tree
Showing 20 changed files with 30 additions and 22 deletions.
5 changes: 3 additions & 2 deletions bom/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<axon-bom.version>4.8.2</axon-bom.version>

<axon-kotlin.version>4.8.0</axon-kotlin.version>
<axon-gateway-extension.version>1.1.2</axon-gateway-extension.version>
<axon-gateway-extension.version>1.1.3-SNAPSHOT</axon-gateway-extension.version>

<awaitility.version>4.2.0</awaitility.version>
<mockito-kotlin.version>5.0.0</mockito-kotlin.version>
Expand Down Expand Up @@ -556,7 +556,8 @@
</includes>
<!-- Sets the VM argument line used when integration tests are run. -->
<!-- prevent the annoying ForkedBooter process from stealing window focus on Mac OS -->
<argLine>-Djava.awt.headless=true @{failsafeArgLine} -XX:+StartAttachListener</argLine>
<!-- the add-opens is required for XStream -->
<argLine>-Djava.awt.headless=true @{failsafeArgLine} -XX:+StartAttachListener --add-opens java.base/java.util=ALL-UNNAMED</argLine>
</configuration>
</plugin>

Expand Down
2 changes: 0 additions & 2 deletions core/bus-jackson/src/main/resources/META-INF/spring.factories

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
io.holunda.polyflow.bus.jackson.config.FallbackPayloadObjectMapperAutoConfiguration
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
drop SEQUENCE hibernate_sequence;
create sequence association_value_entry_seq start with 1 increment by 50;
create sequence domain_event_entry_seq start with 1 increment by 50;
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
drop SEQUENCE hibernate_sequence;
create sequence association_value_entry_seq start with 1 increment by 50;
create sequence domain_event_entry_seq start with 1 increment by 50;

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
io.holunda.polyflow.client.camunda.CamundaEngineClientAutoConfiguration

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
io.holunda.polyflow.taskpool.collector.CamundaTaskpoolCollectorConfiguration
io.holunda.polyflow.taskpool.sender.SenderConfiguration
io.holunda.polyflow.datapool.DataEntrySenderConfiguration

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
io.holunda.polyflow.taskpool.collector.FallbackProcessVariablesCorrelatorConfiguration
io.holunda.polyflow.taskpool.collector.FallbackProcessVariablesFilterConfiguration
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.holunda.polyflow.taskpool.collector.properties

import io.holunda.polyflow.spring.ApplicationNameBeanPostProcessor
import io.holunda.polyflow.taskpool.collector.CamundaTaskpoolCollectorProperties
import io.holunda.polyflow.taskpool.collector.TaskCollectorEnricherType
import io.holunda.polyflow.taskpool.sender.SenderProperties
Expand All @@ -12,6 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Import
import org.springframework.context.annotation.Primary
import org.springframework.test.context.ActiveProfiles

Expand All @@ -34,6 +36,7 @@ internal class CamundaTaskpoolCollectorPropertiesITest {

@SpringBootApplication
@EnableConfigurationProperties(CamundaTaskpoolCollectorProperties::class, SenderProperties::class)
@Import(ApplicationNameBeanPostProcessor::class)
class PropertiesTestApplication {
/**
* Gateway.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
io.holunda.polyflow.taskpool.sender.CamundaJobSenderConfiguration
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package io.holunda.polyflow.datapool

import io.holunda.polyflow.spring.ApplicationNameBeanPostProcessor
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.context.annotation.Import

@SpringBootApplication
@EnableConfigurationProperties(DataEntrySenderProperties::class)
@Import(ApplicationNameBeanPostProcessor::class)
class PropertiesTestApplication

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
io.holunda.polyflow.urlresolver.FallbackTasklistUrlResolverAutoConfiguration
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ package io.holunda.polyflow.view.jpa.itest

import org.hibernate.boot.model.TypeContributions
import org.hibernate.dialect.H2Dialect
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo
import org.hibernate.service.ServiceRegistry
import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl
import java.sql.Types

class FixedH2Dialect : H2Dialect() {
@Suppress("unused") // used in application-itest.yaml
class FixedH2Dialect(info: DialectResolutionInfo) : H2Dialect(info) {
override fun registerColumnTypes(typeContributions: TypeContributions, serviceRegistry: ServiceRegistry) {
super.registerColumnTypes(typeContributions, serviceRegistry)
val ddlTypeRegistry = typeContributions.typeConfiguration.ddlTypeRegistry
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import org.springframework.test.context.ActiveProfiles
import org.springframework.test.context.ContextConfiguration
import java.util.*

@DataJpaTest(showSql = false)
// TODO: Very weird: changing showSql to true fixes the test for me. Timing issue?
@DataJpaTest(showSql = true)
@ContextConfiguration(classes = [TestApplicationDataJpa::class])
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
@ActiveProfiles("itest", "mock-query-emitter")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import org.mockito.Mockito.mock
import org.slf4j.Logger
import java.io.IOException
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicInteger
import javax.net.SocketFactory


Expand Down Expand Up @@ -63,7 +62,7 @@ object MongoLauncher {
.mongodArguments(
Start.to(MongodArguments::class.java).initializedWith(
MongodArguments.builder()
.replication(if (asReplicaSet) Storage.of("repembedded", 16) else null)
.apply { if (asReplicaSet) replication(Storage.of("repembedded", 16)) }
.useNoJournal(!asReplicaSet)
.build()
)
Expand Down

0 comments on commit 26aca30

Please sign in to comment.