From d4ee0c786ca2cc27b35fdfaa7d9d53718fa0bd20 Mon Sep 17 00:00:00 2001 From: Denes Nemeth Date: Thu, 31 May 2018 13:59:34 +0200 Subject: Fix template generation for R2 Change-Id: Ibf53ee4f203f248c930611812f3eb248e3023be8 Signed-off-by: Denes Nemeth Issue-ID: VFC-728 --- .../packagetransformer/TestOnapVnfdBuilder.java | 85 ---------------------- 1 file changed, 85 deletions(-) delete mode 100644 nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestOnapVnfdBuilder.java (limited to 'nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestOnapVnfdBuilder.java') diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestOnapVnfdBuilder.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestOnapVnfdBuilder.java deleted file mode 100644 index a97ee4f1..00000000 --- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestOnapVnfdBuilder.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2016-2017, Nokia Corporation - * - * 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.vfc.nfvo.driver.vnfm.svnfm.nokia.packagetransformer; - -import java.util.NoSuchElementException; -import org.junit.Before; -import org.junit.Test; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.TestUtil; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.TestBase; - -import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.fail; -import static org.mockito.Mockito.verify; -import static org.springframework.test.util.ReflectionTestUtils.setField; - - -public class TestOnapVnfdBuilder extends TestBase { - private OnapVnfdBuilder packageTransformer = new OnapVnfdBuilder(); - - - @Before - public void init() { - setField(OnapVnfdBuilder.class, "logger", logger); - } - - @Test - public void indent() { - assertEquals(" x", packageTransformer.indent("x", 2)); - assertEquals(" x\n", packageTransformer.indent("x\n", 2)); - assertEquals(" x\n y", packageTransformer.indent("x\ny", 2)); - assertEquals(" x\n y\n", packageTransformer.indent("x\ny\n", 2)); - assertEquals(" \n", packageTransformer.indent("\n", 2)); - } - - /** - * Test empty VNFD conversion - */ - @Test - public void testEmpty() { - assertEquals(new String(TestUtil.loadFile("unittests/packageconverter/empty.vnfd.onap.yaml")), packageTransformer.toOnapVnfd(new String(TestUtil.loadFile("unittests/packageconverter/empty.vnfd.cbam.yaml")))); - } - - /** - * Test all Tosca nodes conversions for successful scenario - */ - @Test - public void testNodes() { - assertEquals(new String(TestUtil.loadFile("unittests/packageconverter/nodes.vnfd.onap.yaml")), packageTransformer.toOnapVnfd(new String(TestUtil.loadFile("unittests/packageconverter/nodes.vnfd.cbam.yaml")))); - verify(logger).warn("The {} ecp does not have an internal connection point", "myEcpWithoutIcp"); - verify(logger).warn("The {} ecp does not have an requirements section", "ecpWithIcpWithOutRequirements"); - verify(logger).warn("The {} internal connection point of the {} ecp does not have a VDU", "icpWithoutVdu", "myEcpWithoutIcpWithoutVdu"); - verify(logger).warn("The {} internal connection point of the {} ecp does not have a requirements section", "icpWithOutRequiements", "myEcpWithoutIcpWithoutIcpReq"); - verify(logger).warn("The {} internal connection point does not have a VDU", "icpWithOutVdu"); - verify(logger).warn("The {} internal connection point does not have a requirements section", "icpWithOutRequiements"); - verify(logger).warn("The {} internal connection point does not have a VL", "icpWithOutVl"); - verify(logger).warn("The {} type is not converted", "tosca.nodes.nfv.Unknown"); - } - - /** - * if a node refers to a non existing node it results in a failure - */ - @Test - public void testInconsitentVnfd() { - try { - packageTransformer.toOnapVnfd(new String(TestUtil.loadFile("unittests/packageconverter/nodes.vnfd.inconsistent.cbam.yaml"))); - fail(); - } catch (NoSuchElementException e) { - assertEquals("The VNFD does not have a node called myComputeMissing but required by an other node", e.getMessage()); - } - } - -} -- cgit 1.2.3-korg