rename test profile and small changes

This commit is contained in:
a10zn8
2022-11-23 16:09:16 +04:00
parent d1e05b0215
commit 8bc1862a03
2 changed files with 16 additions and 15 deletions

View File

@@ -63,20 +63,21 @@ open class Config(
private var configFilePath: File? = null
init {
if (!env.activeProfiles.contains("test")) {
configFilePath = getConfigPath()
Global.version = env.getProperty("version.app", Global.version).let {
if (it.contains("SNAPSHOT")) {
listOfNotNull(it, env.getProperty("version.commit")).joinToString("-")
} else {
it
}
}
Security.addProvider(BouncyCastleProvider())
configFilePath = if (env.activeProfiles.contains("integration-test")) {
ResourceUtils.getFile("classpath:integration/dshackle.yaml")
} else {
configFilePath = ResourceUtils.getFile("classpath:integration/dshackle.yaml")
getConfigPath()
}
Global.version = env.getProperty("version.app", Global.version).let {
if (it.contains("SNAPSHOT")) {
listOfNotNull(it, env.getProperty("version.commit")).joinToString("-")
} else {
it
}
}
Security.addProvider(BouncyCastleProvider())
}
fun getConfigPath(): File {
@@ -101,7 +102,7 @@ open class Config(
}
@Bean
@Profile("!test")
@Profile("!integration-test")
open fun mainConfig(@Autowired fileResolver: FileResolver): MainConfig {
val f = configFilePath ?: throw IllegalStateException("Config path is not set")
log.info("Using config: ${f.absolutePath}")

View File

@@ -27,7 +27,7 @@ import java.net.URI
@SpringBootTest(properties = ["spring.main.allow-bean-definition-overriding=true"])
@Import(Config::class)
@ActiveProfiles("test")
@ActiveProfiles("integration-test")
class IntegrationTest {
@Autowired
@@ -78,7 +78,7 @@ class IntegrationTest {
@TestConfiguration
open class Config {
@Bean
@Profile("test")
@Profile("integration-test")
open fun mainConfig(@Autowired fileResolver: FileResolver): MainConfig {
val reader = MainConfigReader(fileResolver)
val config = reader.read(