From 24ac58a1a3854fbd14250afcfbae0197d6a8eb4f Mon Sep 17 00:00:00 2001 From: Andre Weber Date: Thu, 9 Jan 2025 11:14:30 +0100 Subject: [PATCH] test: Move Tests into v1 folder --- .../{ => v1}/DataBrokerConnectionTest.kt | 8 ++++---- .../{ => v1}/DataBrokerConnectorSecureTest.kt | 6 ++++-- .../{ => v1}/DataBrokerConnectorTest.kt | 7 +++++-- .../{ => v1}/DataBrokerTransporterTest.kt | 9 +++++---- .../DataBrokerConnectorAuthenticationTest.kt | 7 ++++--- .../extensions/DataBrokerTransporterExtensions.kt | 4 ++-- .../provider}/DataBrokerConnectorProvider.kt | 11 ++++++++--- .../subscription/DataBrokerSubscriberTest.kt | 15 +++++++-------- .../authentication => mocking}/JwtType.kt | 4 ++-- 9 files changed, 41 insertions(+), 30 deletions(-) rename kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/{ => v1}/DataBrokerConnectionTest.kt (98%) rename kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/{ => v1}/DataBrokerConnectorSecureTest.kt (91%) rename kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/{ => v1}/DataBrokerConnectorTest.kt (90%) rename kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/{ => v1}/DataBrokerTransporterTest.kt (95%) rename kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/{ => databroker/v1}/authentication/DataBrokerConnectorAuthenticationTest.kt (97%) rename kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/{ => connectivity/databroker/v1}/extensions/DataBrokerTransporterExtensions.kt (94%) rename kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/{ => v1/provider}/DataBrokerConnectorProvider.kt (89%) rename kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/{ => v1}/subscription/DataBrokerSubscriberTest.kt (96%) rename kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/{connectivity/authentication => mocking}/JwtType.kt (91%) diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectionTest.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerConnectionTest.kt similarity index 98% rename from kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectionTest.kt rename to kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerConnectionTest.kt index 58762f7..118e306 100644 --- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectionTest.kt +++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerConnectionTest.kt @@ -17,7 +17,7 @@ * */ -package org.eclipse.kuksa.connectivity.databroker +package org.eclipse.kuksa.connectivity.databroker.v1 import io.grpc.ConnectivityState import io.grpc.ManagedChannel @@ -28,17 +28,17 @@ import io.kotest.matchers.shouldNotBe import io.mockk.every import io.mockk.mockk import io.mockk.verify +import org.eclipse.kuksa.connectivity.databroker.DisconnectListener import org.eclipse.kuksa.connectivity.databroker.docker.DataBrokerDockerContainer import org.eclipse.kuksa.connectivity.databroker.docker.InsecureDataBrokerDockerContainer -import org.eclipse.kuksa.connectivity.databroker.v1.DataBrokerConnection -import org.eclipse.kuksa.connectivity.databroker.v1.DataBrokerTransporter +import org.eclipse.kuksa.connectivity.databroker.v1.extensions.updateRandomFloatValue +import org.eclipse.kuksa.connectivity.databroker.v1.provider.DataBrokerConnectorProvider import org.eclipse.kuksa.connectivity.databroker.v1.request.FetchRequest import org.eclipse.kuksa.connectivity.databroker.v1.request.SubscribeRequest import org.eclipse.kuksa.connectivity.databroker.v1.request.UpdateRequest import org.eclipse.kuksa.connectivity.databroker.v1.request.VssNodeFetchRequest import org.eclipse.kuksa.connectivity.databroker.v1.request.VssNodeSubscribeRequest import org.eclipse.kuksa.connectivity.databroker.v1.request.VssNodeUpdateRequest -import org.eclipse.kuksa.extensions.updateRandomFloatValue import org.eclipse.kuksa.mocking.FriendlyVssNodeListener import org.eclipse.kuksa.mocking.FriendlyVssPathListener import org.eclipse.kuksa.proto.v1.Types diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectorSecureTest.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerConnectorSecureTest.kt similarity index 91% rename from kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectorSecureTest.kt rename to kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerConnectorSecureTest.kt index 02b6019..ea282ef 100644 --- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectorSecureTest.kt +++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerConnectorSecureTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,15 @@ * limitations under the License. * * SPDX-License-Identifier: Apache-2.0 + * */ -package org.eclipse.kuksa.connectivity.databroker +package org.eclipse.kuksa.connectivity.databroker.v1 import io.kotest.core.spec.style.BehaviorSpec import org.eclipse.kuksa.connectivity.databroker.docker.DataBrokerDockerContainer import org.eclipse.kuksa.connectivity.databroker.docker.SecureDataBrokerDockerContainer +import org.eclipse.kuksa.connectivity.databroker.v1.provider.DataBrokerConnectorProvider import org.eclipse.kuksa.test.TestResourceFile import org.eclipse.kuksa.test.kotest.Integration import org.eclipse.kuksa.test.kotest.Secure diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectorTest.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerConnectorTest.kt similarity index 90% rename from kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectorTest.kt rename to kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerConnectorTest.kt index 82ce9e5..d42c4a7 100644 --- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectorTest.kt +++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerConnectorTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,18 @@ * limitations under the License. * * SPDX-License-Identifier: Apache-2.0 + * */ -package org.eclipse.kuksa.connectivity.databroker +package org.eclipse.kuksa.connectivity.databroker.v1 import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.BehaviorSpec import io.kotest.matchers.shouldNotBe +import org.eclipse.kuksa.connectivity.databroker.DataBrokerException import org.eclipse.kuksa.connectivity.databroker.docker.DataBrokerDockerContainer import org.eclipse.kuksa.connectivity.databroker.docker.InsecureDataBrokerDockerContainer +import org.eclipse.kuksa.connectivity.databroker.v1.provider.DataBrokerConnectorProvider import org.eclipse.kuksa.test.kotest.Insecure import org.eclipse.kuksa.test.kotest.InsecureDataBroker import org.eclipse.kuksa.test.kotest.Integration diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerTransporterTest.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerTransporterTest.kt similarity index 95% rename from kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerTransporterTest.kt rename to kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerTransporterTest.kt index fa546ac..92fc61e 100644 --- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerTransporterTest.kt +++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/DataBrokerTransporterTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,10 @@ * limitations under the License. * * SPDX-License-Identifier: Apache-2.0 + * */ -package org.eclipse.kuksa.connectivity.databroker +package org.eclipse.kuksa.connectivity.databroker.v1 import io.grpc.ManagedChannelBuilder import io.kotest.assertions.nondeterministic.eventually @@ -28,9 +29,9 @@ import io.mockk.mockk import io.mockk.verify import org.eclipse.kuksa.connectivity.databroker.docker.DataBrokerDockerContainer import org.eclipse.kuksa.connectivity.databroker.docker.InsecureDataBrokerDockerContainer -import org.eclipse.kuksa.connectivity.databroker.v1.DataBrokerTransporter +import org.eclipse.kuksa.connectivity.databroker.v1.extensions.updateRandomFloatValue import org.eclipse.kuksa.connectivity.databroker.v1.listener.VssPathListener -import org.eclipse.kuksa.extensions.updateRandomFloatValue +import org.eclipse.kuksa.connectivity.databroker.v1.provider.DataBrokerConnectorProvider import org.eclipse.kuksa.mocking.FriendlyVssPathListener import org.eclipse.kuksa.proto.v1.KuksaValV1 import org.eclipse.kuksa.proto.v1.Types diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/authentication/DataBrokerConnectorAuthenticationTest.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/authentication/DataBrokerConnectorAuthenticationTest.kt similarity index 97% rename from kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/authentication/DataBrokerConnectorAuthenticationTest.kt rename to kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/authentication/DataBrokerConnectorAuthenticationTest.kt index d292b66..c19c996 100644 --- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/authentication/DataBrokerConnectorAuthenticationTest.kt +++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/authentication/DataBrokerConnectorAuthenticationTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 - 2024 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ * */ -package org.eclipse.kuksa.connectivity.authentication +package org.eclipse.kuksa.connectivity.databroker.v1.authentication import io.grpc.StatusRuntimeException import io.kotest.assertions.nondeterministic.eventually @@ -26,14 +26,15 @@ import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe import io.kotest.matchers.string.shouldContain import io.kotest.matchers.types.instanceOf -import org.eclipse.kuksa.connectivity.databroker.DataBrokerConnectorProvider import org.eclipse.kuksa.connectivity.databroker.DataBrokerException import org.eclipse.kuksa.connectivity.databroker.docker.DataBrokerDockerContainer import org.eclipse.kuksa.connectivity.databroker.docker.SecureDataBrokerDockerContainer +import org.eclipse.kuksa.connectivity.databroker.v1.provider.DataBrokerConnectorProvider import org.eclipse.kuksa.connectivity.databroker.v1.request.FetchRequest import org.eclipse.kuksa.connectivity.databroker.v1.request.SubscribeRequest import org.eclipse.kuksa.connectivity.databroker.v1.request.UpdateRequest import org.eclipse.kuksa.mocking.FriendlyVssPathListener +import org.eclipse.kuksa.mocking.JwtType import org.eclipse.kuksa.proto.v1.Types import org.eclipse.kuksa.test.kotest.Authentication import org.eclipse.kuksa.test.kotest.Integration diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/extensions/DataBrokerTransporterExtensions.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/extensions/DataBrokerTransporterExtensions.kt similarity index 94% rename from kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/extensions/DataBrokerTransporterExtensions.kt rename to kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/extensions/DataBrokerTransporterExtensions.kt index c4aceb1..ac887a6 100644 --- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/extensions/DataBrokerTransporterExtensions.kt +++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/extensions/DataBrokerTransporterExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ * */ -package org.eclipse.kuksa.extensions +package org.eclipse.kuksa.connectivity.databroker.v1.extensions import io.kotest.assertions.fail import org.eclipse.kuksa.connectivity.databroker.v1.DataBrokerTransporter diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectorProvider.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/provider/DataBrokerConnectorProvider.kt similarity index 89% rename from kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectorProvider.kt rename to kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/provider/DataBrokerConnectorProvider.kt index 63ee1a6..b88671a 100644 --- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectorProvider.kt +++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/provider/DataBrokerConnectorProvider.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,10 @@ * limitations under the License. * * SPDX-License-Identifier: Apache-2.0 + * */ -package org.eclipse.kuksa.connectivity.databroker +package org.eclipse.kuksa.connectivity.databroker.v1.provider import io.grpc.ChannelCredentials import io.grpc.Grpc @@ -24,10 +25,13 @@ import io.grpc.ManagedChannel import io.grpc.ManagedChannelBuilder import io.grpc.TlsChannelCredentials import org.eclipse.kuksa.connectivity.authentication.JsonWebToken -import org.eclipse.kuksa.connectivity.authentication.JwtType +import org.eclipse.kuksa.connectivity.databroker.DATABROKER_HOST +import org.eclipse.kuksa.connectivity.databroker.DATABROKER_TIMEOUT_SECONDS +import org.eclipse.kuksa.connectivity.databroker.DATABROKER_TIMEOUT_UNIT import org.eclipse.kuksa.connectivity.databroker.docker.DEFAULT_PORT_INSECURE import org.eclipse.kuksa.connectivity.databroker.docker.DEFAULT_PORT_SECURE import org.eclipse.kuksa.connectivity.databroker.v1.DataBrokerConnector +import org.eclipse.kuksa.mocking.JwtType import org.eclipse.kuksa.model.TimeoutConfig import org.eclipse.kuksa.test.TestResourceFile import java.io.IOException @@ -35,6 +39,7 @@ import java.io.InputStream class DataBrokerConnectorProvider { lateinit var managedChannel: ManagedChannel + fun createInsecure( host: String = DATABROKER_HOST, port: Int = DEFAULT_PORT_INSECURE, diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/subscription/DataBrokerSubscriberTest.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/subscription/DataBrokerSubscriberTest.kt similarity index 96% rename from kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/subscription/DataBrokerSubscriberTest.kt rename to kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/subscription/DataBrokerSubscriberTest.kt index 5f3acae..5ef2919 100644 --- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/subscription/DataBrokerSubscriberTest.kt +++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/v1/subscription/DataBrokerSubscriberTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,10 @@ * limitations under the License. * * SPDX-License-Identifier: Apache-2.0 + * */ -package org.eclipse.kuksa.connectivity.databroker.subscription +package org.eclipse.kuksa.connectivity.databroker.v1.subscription import io.kotest.assertions.nondeterministic.continually import io.kotest.assertions.nondeterministic.eventually @@ -27,16 +28,14 @@ import io.mockk.clearMocks import io.mockk.every import io.mockk.mockk import io.mockk.verify -import org.eclipse.kuksa.connectivity.databroker.DataBrokerConnectorProvider import org.eclipse.kuksa.connectivity.databroker.docker.DataBrokerDockerContainer import org.eclipse.kuksa.connectivity.databroker.docker.InsecureDataBrokerDockerContainer import org.eclipse.kuksa.connectivity.databroker.v1.DataBrokerTransporter +import org.eclipse.kuksa.connectivity.databroker.v1.extensions.toggleBoolean +import org.eclipse.kuksa.connectivity.databroker.v1.extensions.updateRandomFloatValue +import org.eclipse.kuksa.connectivity.databroker.v1.extensions.updateRandomUint32Value import org.eclipse.kuksa.connectivity.databroker.v1.listener.VssPathListener -import org.eclipse.kuksa.connectivity.databroker.v1.subscription.DataBrokerSubscriber -import org.eclipse.kuksa.connectivity.databroker.v1.subscription.DataBrokerSubscription -import org.eclipse.kuksa.extensions.toggleBoolean -import org.eclipse.kuksa.extensions.updateRandomFloatValue -import org.eclipse.kuksa.extensions.updateRandomUint32Value +import org.eclipse.kuksa.connectivity.databroker.v1.provider.DataBrokerConnectorProvider import org.eclipse.kuksa.mocking.FriendlyVssNodeListener import org.eclipse.kuksa.mocking.FriendlyVssPathListener import org.eclipse.kuksa.pattern.listener.MultiListener diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/authentication/JwtType.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/mocking/JwtType.kt similarity index 91% rename from kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/authentication/JwtType.kt rename to kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/mocking/JwtType.kt index e87f9d6..4b7af9f 100644 --- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/authentication/JwtType.kt +++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/mocking/JwtType.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 - 2024 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ * */ -package org.eclipse.kuksa.connectivity.authentication +package org.eclipse.kuksa.mocking import org.eclipse.kuksa.test.TestResourceFile import java.io.InputStream