From 4a2962b60486dfa9dc2736342da69f12660f0005 Mon Sep 17 00:00:00 2001 From: Ganesh Date: Fri, 15 Jul 2022 13:41:28 +0530 Subject: GenericVnfTest, Don't use assertNotNull() inside a try-catch catching an AssertionError Signed-off-by: Ganesh Change-Id: I1212a1b20dfca179b1b5be6b3147242d4f52a11c Issue-ID: CCSDK-3476 --- .../org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java index 66d34a8b8..0edb9d3f6 100755 --- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java +++ b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START======================================================= * openECOMP : SDN-C * ================================================================================ - * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights - * reserved. + * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2022 Samsung Electronics 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. @@ -48,6 +48,7 @@ import org.onap.ccsdk.sli.adaptors.aai.AAIClient; import org.onap.ccsdk.sli.adaptors.aai.AAIRequest; import org.onap.ccsdk.sli.adaptors.aai.AAIService; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; import org.onap.aai.inventory.v25.GenericVnf; import org.slf4j.Logger; @@ -106,13 +107,8 @@ public class GenericVnfTest { QueryStatus resp = client.save("generic-vnf", false, false, "generic-vnf.vnf-id = '"+uuid+"'", data, "aaidata", ctx); assertNotNull(ctx); - - } - catch (Throwable e) - { - - } - ; + } + catch (SvcLogicException ignored) { }; } @Test -- cgit 1.2.3-korg