2 files changed, 61 insertions, 0 deletions

diff --git a/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationManagerTest.java b/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationManagerTest.java
index a0c19b314f..0cf350cd73 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationManagerTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationManagerTest.java
@@ -49,6 +49,7 @@ public class ConfigurationManagerTest {
     private class TestPluginsConfiguration extends PluginsConfiguration {}
     private class TestRestConfigurationInfo extends RestConfigurationInfo {}
     private class TestEcompErrorConfiguration extends EcompErrorConfiguration {}
+    private class TestWorkspaceConfiguration extends WorkspaceConfiguration {}
 
     @Test
     public void validateConfigurationManageIsConstructWithAllConfiguration() {
@@ -64,6 +65,9 @@ public class ConfigurationManagerTest {
         when(configurationSource.
                 getAndWatchConfiguration(eq(EcompErrorConfiguration.class),any(ConfigurationListener.class))
         ).thenReturn(new TestEcompErrorConfiguration());
+        when(configurationSource.
+                getAndWatchConfiguration(eq(WorkspaceConfiguration.class),any(ConfigurationListener.class))
+        ).thenReturn(new TestWorkspaceConfiguration());
 
         configurationManager = new ConfigurationManager(configurationSource);
 
@@ -71,6 +75,7 @@ public class ConfigurationManagerTest {
         assertEquals(configurationManager.getPluginsConfiguration().getClass(), TestPluginsConfiguration.class);
         assertEquals(configurationManager.getRestClientConfiguration().getClass(), TestRestConfigurationInfo.class);
         assertEquals(configurationManager.getEcompErrorConfiguration().getClass(), TestEcompErrorConfiguration.class);
+        assertEquals(configurationManager.getWorkspaceConfiguration().getClass(), TestWorkspaceConfiguration.class);
     }
 
     @Test
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/fe/config/WorkspaceConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/fe/config/WorkspaceConfigurationTest.java
new file mode 100644
index 0000000000..dd1fe8b2be
--- /dev/null
+++ b/common-app-api/src/test/java/org/openecomp/sdc/fe/config/WorkspaceConfigurationTest.java
@@ -0,0 +1,56 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2019 Nokia. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.fe.config;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.openecomp.sdc.common.api.ConfigurationSource;
+import org.openecomp.sdc.common.impl.ExternalConfiguration;
+import org.openecomp.sdc.common.impl.FSConfigurationSource;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class WorkspaceConfigurationTest {
+    private WorkspaceConfiguration workspaceConfiguration = new WorkspaceConfiguration();
+
+    @Mock
+    private ConfigurationManager configurationManager;
+
+    @Before
+    public void setUp() {
+        String appConfigDir = "src/test/resources/config/common";
+        ConfigurationSource configurationSource =
+                new FSConfigurationSource(ExternalConfiguration.getChangeListener(), appConfigDir);
+        configurationManager = new ConfigurationManager(configurationSource);
+    }
+
+    @Test
+    public void validateInstanceGetsProperTestManager() {
+        workspaceConfiguration = configurationManager.getWorkspaceConfiguration();
+        assertEquals(7,workspaceConfiguration.getWorkspaceMenuConfiguration().size());
+        assertTrue(workspaceConfiguration.getWorkspaceMenuConfiguration().containsKey("VFC"));
+    }
+}