diff options
author | 2018-11-29 16:18:26 +0530 | |
---|---|---|
committer | 2018-11-29 16:18:26 +0530 | |
commit | 78a858f5e83cdefe579bb880ab73d45adff502d2 (patch) | |
tree | 5668354cbc60e4314eaaca094c597dd609652e12 /UniversalVesAdapter/src/test | |
parent | 4a8d434d9082f7c3eeeafa2fef2aa70223a64db3 (diff) |
Logging Compliance as per ONAP
Logging compliance done as per ONAP
Issue-ID: DCAEGEN2-997
Change-Id: Ida19d8ed69d4e662ae632bf4456348a229c7e2e5
Signed-off-by: Pooja03 <pm00501616@techmahindra.com>
Diffstat (limited to 'UniversalVesAdapter/src/test')
5 files changed, 6 insertions, 121 deletions
diff --git a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/adapter/UniversalEventAdapterTest.java b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/adapter/UniversalEventAdapterTest.java index 94eee43..ec3cf7f 100644 --- a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/adapter/UniversalEventAdapterTest.java +++ b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/adapter/UniversalEventAdapterTest.java @@ -45,7 +45,7 @@ import org.springframework.test.context.junit4.SpringRunner; @Ignore public class UniversalEventAdapterTest { - private final Logger eLOGGER = LoggerFactory.getLogger(this.getClass()); + private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger"); @Mock private VESAdapterInitializer vESAdapterInitializer; @@ -223,7 +223,7 @@ public class UniversalEventAdapterTest { assertNotNull(actualResult); assertNotEquals("", actualResult); } catch (VesException exception) { - eLOGGER.error("Error occurred : ", exception ); + errorLogger.error("Error occurred : {}", exception ); } } diff --git a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/service/ConfigFileServiceTest.java b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/service/ConfigFileServiceTest.java deleted file mode 100644 index 0c7ff37..0000000 --- a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/service/ConfigFileServiceTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* ONAP : DCAE -* ================================================================================ -* Copyright 2018 TechMahindra -*================================================================================= -* 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.onap.universalvesadapter.service; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class ConfigFileServiceTest { - - @Test - public void test() { - fail("Not yet implemented"); - } - -} -*/
\ No newline at end of file diff --git a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/service/DiskRepoConfigFileServiceTest.java b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/service/DiskRepoConfigFileServiceTest.java deleted file mode 100644 index a639c1f..0000000 --- a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/service/DiskRepoConfigFileServiceTest.java +++ /dev/null @@ -1,81 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* ONAP : DCAE -* ================================================================================ -* Copyright 2018 TechMahindra -*================================================================================= -* 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.onap.universalvesadapter.service; - -import static org.junit.Assert.assertEquals; -import java.net.URI; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; -import org.onap.universalvesadapter.Application; -import org.onap.universalvesadapter.exception.ConfigFileReadException; -import org.onap.universalvesadapter.service.DiskRepoConfigFileService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.web.client.RestTemplate; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class DiskRepoConfigFileServiceTest { - - @Mock - RestTemplate restTemplate; - - @InjectMocks - @Autowired - DiskRepoConfigFileService diskRepoConfigFileService; - - private final Logger eLOGGER = LoggerFactory.getLogger(this.getClass()); - - @Before - public void init() { - MockitoAnnotations.initMocks(this); - } - - - @Test - public void testReadConfigFile() { - - String result = "test file"; - - ResponseEntity<String> fileDataEntity = new ResponseEntity<String>(result, HttpStatus.OK); - - Mockito.when(restTemplate.getForEntity(Mockito.any(URI.class), Mockito.any(Class.class))).thenReturn(fileDataEntity); - - try { - String readConfigFile = diskRepoConfigFileService.readConfigFile("testCase.xml"); - assertEquals(result, readConfigFile); - } catch (ConfigFileReadException exception) { - eLOGGER.error("Error occurred : ", exception); - } - - } - -} -*/
\ No newline at end of file diff --git a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/MapperConfigUtilsTest.java b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/MapperConfigUtilsTest.java index c448908..20e6d84 100644 --- a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/MapperConfigUtilsTest.java +++ b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/MapperConfigUtilsTest.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; public class MapperConfigUtilsTest { - private final Logger eLOGGER = LoggerFactory.getLogger(this.getClass()); + private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger"); String mappingFileContent = "{" + " \"entries\" : [" + " {" @@ -74,7 +74,7 @@ public class MapperConfigUtilsTest { .checkIncomingJsonForMatchingDomain(inputJsonString); assertEquals("snmp", checkIncomingJsonForMatchingDomain); } catch (MapperConfigException exception) { - eLOGGER.error("Error occurred : ", exception ); + errorLogger.error("Error occurred : ", exception ); } } diff --git a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/SmooksUtilsTest.java b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/SmooksUtilsTest.java index 42974f6..6add493 100644 --- a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/SmooksUtilsTest.java +++ b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/SmooksUtilsTest.java @@ -34,7 +34,7 @@ import org.xml.sax.SAXException; public class SmooksUtilsTest { - private final Logger eLOGGER = LoggerFactory.getLogger(this.getClass()); + private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger"); @Test public void testGetTransformedObjectForInput() { @@ -106,7 +106,7 @@ public class SmooksUtilsTest { vesEvent = SmooksUtils.getTransformedObjectForInput(smooks, incomingJsonString.toString()); } catch (IOException | SAXException exception) { - eLOGGER.error("Error occurred : ", exception ); + errorLogger.error("Error occurred : ", exception ); } assertEquals(vesEvent.getEvent().getCommonEventHeader().getDomain(), "UCSNMP-HEARTBEAT"); |