From 2074ab2e8b4416126542c09205d3ca6646ed6718 Mon Sep 17 00:00:00 2001 From: vempo Date: Sun, 28 Oct 2018 14:45:46 +0200 Subject: Removed support of dynamic configuration Configuration framework will not poll configuration for changes, and will not notify client code of them. Also minor cleanup, added unit tests. Change-Id: I428b23f7acb13c6610390f46aae6e011d6b0ee80 Issue-ID: SDC-1867 Signed-off-by: vempo --- .../org/onap/config/api/ConfigurationTest.java | 72 ++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 common/onap-common-configuration-management/onap-configuration-management-api/src/test/java/org/onap/config/api/ConfigurationTest.java (limited to 'common/onap-common-configuration-management/onap-configuration-management-api/src/test/java/org') diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/src/test/java/org/onap/config/api/ConfigurationTest.java b/common/onap-common-configuration-management/onap-configuration-management-api/src/test/java/org/onap/config/api/ConfigurationTest.java new file mode 100644 index 0000000000..9945a938d3 --- /dev/null +++ b/common/onap-common-configuration-management/onap-configuration-management-api/src/test/java/org/onap/config/api/ConfigurationTest.java @@ -0,0 +1,72 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.config.api; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; + +/** + * @author evitaliy + * @since 28 Oct 2018 + */ +public class ConfigurationTest { + + @After + public void cleanUp() { + Configuration.TENANT.remove(); + } + + @Test + public void tenantRetrievedWhenPreviouslySet() { + final String tenantId = "abc"; + Configuration.setTenantId(tenantId); + Assert.assertEquals(tenantId, Configuration.TENANT.get()); + } + + @Test + public void tenantEmptyWhenNeverSet() { + Assert.assertNull(Configuration.TENANT.get()); + } + + @Test + public void tenantNullWhenNullSet() { + Configuration.setTenantId("xyz"); + Configuration.setTenantId(null); + Assert.assertNull(Configuration.TENANT.get()); + } + + @Test + public void tenantNullWhenEmptySet() { + Configuration.setTenantId("xyz"); + Configuration.setTenantId(""); + Assert.assertNull(Configuration.TENANT.get()); + } + + @Test + public void tenantDoesNotPropagateToAnotherThread() throws ExecutionException, InterruptedException { + final String currentTenant = "xyz"; + Configuration.setTenantId(currentTenant); + CompletableFuture result = new CompletableFuture<>(); + Thread otherThread = new Thread(() -> result.complete(Configuration.TENANT.get())); + otherThread.start(); + Assert.assertNull("Tenant in the other thread expected to be null", result.get()); + Assert.assertEquals(currentTenant, Configuration.TENANT.get()); + } +} \ No newline at end of file -- cgit