From e2d69b23de157ab9a105a3b20f98c441106d204a Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Tue, 14 Jan 2020 12:00:51 +0100 Subject: Extract query Issue-ID: DCAEGEN2-2019 Signed-off-by: Zebek Bogumil Change-Id: I5f22589af67e11bf5bf7292f95df9f416007a15f --- .../impl/DcaeServiceTypesApiServiceImplTests.java | 37 ++++++++++++++++++---- 1 file changed, 31 insertions(+), 6 deletions(-) (limited to 'src/test/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImplTests.java') diff --git a/src/test/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImplTests.java b/src/test/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImplTests.java index c1d200f..13dd820 100644 --- a/src/test/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImplTests.java +++ b/src/test/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImplTests.java @@ -3,6 +3,7 @@ package io.swagger.api.impl;/*- * dcae-inventory * ================================================================================ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020 Nokia Intellectual Property. 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. @@ -121,9 +122,9 @@ public class DcaeServiceTypesApiServiceImplTests { fullFixture.setCreated(DateTime.parse("2016-10-28T00:00")); fullFixture.setAsdcServiceId("4bb4e740-3920-442d-9ed3-89f15bdbff8a"); fullFixture.setAsdcResourceId("3ea9dfae-a00d-4da8-8c87-02a34de8fc02"); - fullFixture.setVnfTypes(Arrays.asList(new String[] { "vnf-marble", "vnf-granite" })); - fullFixture.setServiceIds(Arrays.asList(new String[] { "service-alpha", "service-bravo" })); - fullFixture.setServiceLocations(Arrays.asList(new String[] { "New York", "Washington" })); + fullFixture.setVnfTypes(Arrays.asList("vnf-marble", "vnf-granite")); + fullFixture.setServiceIds(Arrays.asList("service-alpha", "service-bravo")); + fullFixture.setServiceLocations(Arrays.asList("New York", "Washington")); for (DCAEServiceTypeObject fixture : new DCAEServiceTypeObject[] {minimalFixture, fullFixture}) { String someTypeId = fixture.getTypeId(); @@ -184,9 +185,9 @@ public class DcaeServiceTypesApiServiceImplTests { fullFixture.setBlueprintTemplate("{ blueprint template goes here }"); fullFixture.setAsdcServiceId("4bb4e740-3920-442d-9ed3-89f15bdbff8a"); fullFixture.setAsdcResourceId("3ea9dfae-a00d-4da8-8c87-02a34de8fc02"); - fullFixture.setVnfTypes(Arrays.asList(new String[] { "vnf-marble", "vnf-granite" })); - fullFixture.setServiceIds(Arrays.asList(new String[] { "service-alpha", "service-bravo" })); - fullFixture.setServiceLocations(Arrays.asList(new String[] { "New York", "Washington" })); + fullFixture.setVnfTypes(Arrays.asList("vnf-marble", "vnf-granite")); + fullFixture.setServiceIds(Arrays.asList("service-alpha", "service-bravo")); + fullFixture.setServiceLocations(Arrays.asList("New York", "Washington")); for (DCAEServiceTypeRequest fixture : new DCAEServiceTypeRequest[] {minimalFixture, fullFixture}) { try { @@ -222,4 +223,28 @@ public class DcaeServiceTypesApiServiceImplTests { } } + @Test + public void shouldReturnOriginalTypeName(){ + // given + String typeName = "abc"; + + // when + final String actual = DcaeServiceTypesApiServiceImpl.resolveTypeName(typeName); + + // then + assertEquals("abc", actual); + } + + @Test + public void shouldTransformAsteriskToPercentCharacterInTypeName(){ + // given + String typeName = "abc*d"; + + // when + final String actual = DcaeServiceTypesApiServiceImpl.resolveTypeName(typeName); + + // then + assertEquals("abc%d", actual); + } + } -- cgit 1.2.3-korg