diff --git a/application/src/integrationTest/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/IntegrationTest.kt b/application/src/integrationTest/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/IntegrationTest.kt index b36d257..1c4439b 100644 --- a/application/src/integrationTest/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/IntegrationTest.kt +++ b/application/src/integrationTest/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/IntegrationTest.kt @@ -16,18 +16,17 @@ import org.awaitility.Awaitility import org.eclipse.californium.core.coap.CoAP import org.eclipse.californium.core.coap.MediaTypeRegistry import org.eclipse.californium.core.coap.Request -import org.gxf.standalonenotifyinggateway.coaphttpproxy.coap.configuration.properties.PskStubProperties +import org.gxf.standalonenotifyinggateway.coaphttpproxy.configuration.PskStubProperties import org.gxf.standalonenotifyinggateway.coaphttpproxy.http.HttpClient import org.gxf.standalonenotifyinggateway.coaphttpproxy.http.configuration.properties.HttpProperties import org.junit.jupiter.api.AfterEach -import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.boot.test.context.SpringBootTest import org.springframework.context.annotation.Import -import java.net.URL +import java.net.URI import java.time.Duration @Import(IntegrationTestCoapClient::class) @@ -61,7 +60,7 @@ class IntegrationTest { } """) - val url = URL(httpProperties.url) + val url = URI(httpProperties.url).toURL() wiremock = WireMockServer(url.port) wiremock.stubFor(wiremockStubErrorEndpoint) wiremock.stubFor(wiremockStubOk) diff --git a/application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/properties/PskStubProperties.kt b/application/src/integrationTest/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/configuration/PskStubProperties.kt similarity index 77% rename from application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/properties/PskStubProperties.kt rename to application/src/integrationTest/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/configuration/PskStubProperties.kt index 8745ef6..5b54297 100644 --- a/application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/properties/PskStubProperties.kt +++ b/application/src/integrationTest/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/configuration/PskStubProperties.kt @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package org.gxf.standalonenotifyinggateway.coaphttpproxy.coap.configuration.properties +package org.gxf.standalonenotifyinggateway.coaphttpproxy.configuration import org.springframework.boot.context.properties.ConfigurationProperties