diff options
Diffstat (limited to 'sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationMergerTest.kt')
-rw-r--r-- | sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationMergerTest.kt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationMergerTest.kt b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationMergerTest.kt index bc61b57d..4cd2ba97 100644 --- a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationMergerTest.kt +++ b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationMergerTest.kt @@ -55,9 +55,9 @@ internal object ConfigurationMergerTest : Spek({ } it("merges single parameter into full config") { - val actual = FileConfigurationReader().loadConfig( + val actual = JsonConfigurationParser().parse( InputStreamReader( - FileConfigurationReaderTest.javaClass.getResourceAsStream("/sampleConfig.json")) as Reader) + JsonConfigurationParserTest.javaClass.getResourceAsStream("/sampleConfig.json")) as Reader) val diff = PartialConfiguration(logLevel = Some(LogLevel.INFO)) val result = ConfigurationMerger().merge(actual, diff) @@ -66,31 +66,31 @@ internal object ConfigurationMergerTest : Spek({ } it("merges single embedded parameter into full config") { - val actual = FileConfigurationReader().loadConfig( + val actual = JsonConfigurationParser().parse( InputStreamReader( - FileConfigurationReaderTest.javaClass.getResourceAsStream("/sampleConfig.json")) as Reader) + JsonConfigurationParserTest.javaClass.getResourceAsStream("/sampleConfig.json")) as Reader) val diff = PartialConfiguration(listenPort = someListenPort) val result = ConfigurationMerger().merge(actual, diff) assertThat(result.listenPort).isEqualTo(someListenPort) assertThat(result.idleTimeoutSec.isEmpty()).isFalse() - assertThat(result.idleTimeoutSec).isEqualTo(Some(Duration.ofSeconds(1200))) + assertThat(result.idleTimeoutSec).isEqualTo(Some(1200L)) assertThat(result.maxPayloadSizeBytes.isEmpty()).isFalse() assertThat(result.maxPayloadSizeBytes).isEqualTo(Some(1048576)) } it("merges full config into single parameter") { val actual = PartialConfiguration(logLevel = Some(LogLevel.INFO)) - val diff = FileConfigurationReader().loadConfig( + val diff = JsonConfigurationParser().parse( InputStreamReader( - FileConfigurationReaderTest.javaClass.getResourceAsStream("/sampleConfig.json")) as Reader) + JsonConfigurationParserTest.javaClass.getResourceAsStream("/sampleConfig.json")) as Reader) val result = ConfigurationMerger().merge(actual, diff) assertThat(result.logLevel).isEqualTo(Some(LogLevel.ERROR)) assertThat(result.maxPayloadSizeBytes).isEqualTo(Some(1048576)) - assertThat(result.idleTimeoutSec).isEqualTo(Some(Duration.ofSeconds(1200))) + assertThat(result.idleTimeoutSec).isEqualTo(Some(1200L)) assertThat(result.keyStoreFile.isEmpty()).isFalse() assertThat(result.firstRequestDelaySec.isEmpty()).isFalse() |