From 132c8fd5be0cedc747e36d203a076ef594922f83 Mon Sep 17 00:00:00 2001 From: "Muthuramalingam, Brinda Santh(bs2796)" Date: Wed, 12 Dec 2018 16:49:04 -0500 Subject: Add multiple location repo for enhancer. Change-Id: I5333b30fad8d754caf8dc89956132e4637f28c26 Issue-ID: CCSDK-803 Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) --- .../enhancer/BluePrintEnhancerServiceImplTest.java | 62 ++++++++++++++++++++++ .../ResourceAssignmentEnhancerServiceTest.java | 24 +++++---- .../service/rs/ConfigModelRestTest.java | 3 ++ .../service/rs/ServiceTemplateRestTest.java | 4 +- 4 files changed, 80 insertions(+), 13 deletions(-) create mode 100644 ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.java (limited to 'ms/controllerblueprints/modules/service/src/test') diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.java new file mode 100644 index 000000000..01b517620 --- /dev/null +++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.java @@ -0,0 +1,62 @@ +/* + * Copyright © 2017-2018 AT&T Intellectual Property. + * + * 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.ccsdk.apps.controllerblueprints.service.enhancer; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.onap.ccsdk.apps.controllerblueprints.TestApplication; +import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintEnhancerService; +import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext; +import org.onap.ccsdk.apps.controllerblueprints.service.load.ModelTypeLoadService; +import org.onap.ccsdk.apps.controllerblueprints.service.load.ResourceDictionaryLoadService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@ContextConfiguration(classes = {TestApplication.class}) +@TestPropertySource(locations = {"classpath:application.properties"}) +public class BluePrintEnhancerServiceImplTest { + + @Autowired + private ModelTypeLoadService modelTypeLoadService; + + @Autowired + private ResourceDictionaryLoadService resourceDictionaryLoadService; + + @Autowired + private BluePrintEnhancerService bluePrintEnhancerService; + + @Before + public void init() { + modelTypeLoadService.loadModelType("./../../../../components/model-catalog/definition-type/starter-type"); + resourceDictionaryLoadService.loadResourceDictionary("./../../../../components/model-catalog/resource-dictionary/starter-dictionary"); + } + + @Test + public void testEnhancement() throws Exception { + + String basePath = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration"; + + BluePrintContext bluePrintContext = bluePrintEnhancerService.enhance(basePath); + Assert.assertNotNull("failed to get blueprintContext ", bluePrintContext); + + } +} \ No newline at end of file diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/ResourceAssignmentEnhancerServiceTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/ResourceAssignmentEnhancerServiceTest.java index 7d508a625..b6e31318f 100644 --- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/ResourceAssignmentEnhancerServiceTest.java +++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/ResourceAssignmentEnhancerServiceTest.java @@ -18,10 +18,15 @@ package org.onap.ccsdk.apps.controllerblueprints.service.enhancer; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; +import org.junit.Assert; import org.junit.Before; import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException; +import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils; +import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment; import org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils.ResourceDictionaryTestUtils; +import java.util.List; + /** * ResourceAssignmentEnhancerService. * @@ -38,20 +43,17 @@ public class ResourceAssignmentEnhancerServiceTest { //@Test public void testEnhanceBluePrint() throws BluePrintException { - /* - FIXME("Test Once Implemented") - List resourceAssignments = JacksonUtils - .getListFromClassPathFile("enhance/enhance-resource-assignment.json", ResourceAssignment.class); + + List resourceAssignments = JacksonUtils.getListFromClassPathFile("enhance/enhance-resource-assignment.json", ResourceAssignment.class); Assert.assertNotNull("Failed to get Resource Assignment", resourceAssignments); - ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("./../../../../components/model-catalog"); - ResourceAssignmentEnhancerService resourceAssignmentEnhancerService = - new ResourceAssignmentEnhancerDefaultService(resourceDefinitionRepoService); - ServiceTemplate serviceTemplate = resourceAssignmentEnhancerService.enhanceBluePrint(resourceAssignments); - Assert.assertNotNull("Failed to get Enriched service Template", serviceTemplate); - log.trace("Enhanced Service Template : {}", JacksonUtils.getJson(serviceTemplate, true)); - */ +// ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("./../../../../components/model-catalog"); +// ResourceAssignmentEnhancerService resourceAssignmentEnhancerService = new ResourceAssignmentEnhancerServiceImpl(resourceDefinitionRepoService); +// ServiceTemplate serviceTemplate = resourceAssignmentEnhancerService.enhanceBluePrint(resourceAssignments); +// Assert.assertNotNull("Failed to get Enriched service Template", serviceTemplate); +// log.trace("Enhanced Service Template : {}", JacksonUtils.getJson(serviceTemplate, true)); + } } diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRestTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRestTest.java index 4fa827c2a..6be86fc3e 100644 --- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRestTest.java +++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRestTest.java @@ -70,6 +70,7 @@ public class ConfigModelRestTest { } + @Deprecated @Test public void test02SaveServiceTemplate() throws Exception { log.info("************************ test02SaveServiceTemplate ******************"); @@ -117,6 +118,7 @@ public class ConfigModelRestTest { } + @Deprecated @Test public void test04GetConfigModel() throws Exception { log.info("** test04GetConfigModel *****************"); @@ -131,6 +133,7 @@ public class ConfigModelRestTest { } + @Deprecated @Test public void test05GetCloneConfigModel() throws Exception { log.info("** test05GetCloneConfigModel *****************"); diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRestTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRestTest.java index 9902f9294..e513ff533 100644 --- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRestTest.java +++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRestTest.java @@ -43,7 +43,7 @@ import java.io.File; import java.nio.charset.Charset; import java.util.List; - +@Deprecated @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"blueprints.load.initial-data=true"}) @ContextConfiguration(classes = {TestApplication.class}) @@ -57,7 +57,7 @@ public class ServiceTemplateRestTest { @Autowired private ServiceTemplateRest serviceTemplateRest; - @Test + //@Test FIXME("Enable once Complete Enhancement Service Implemented") public void test02EnrichServiceTemplate() throws Exception { log.info("*********** test02EnrichServiceTemplate ***********************"); String file = "src/test/resources/enhance/enhance-template.json"; -- cgit 1.2.3-korg