From f9f112f5fd5b193e79e38442cc566b7b437f87d2 Mon Sep 17 00:00:00 2001
From: noahs <noah.shogan@gmail.com>
Date: Wed, 6 Dec 2017 13:11:38 +0200
Subject: Duplicate logging frameworks merging

There was two copies of the SDC logging framework

Change-Id: I55c94c9817a83162c6d90e504dfd91e4858c7269
Issue-ID: SDC-703
Signed-off-by: noahs <noah.shogan@amdocs.com>
---
 .../core/logging/api/LoggerFactoryTest.java        | 74 ----------------------
 .../core/logging/api/context/TaskFactoryTest.java  | 30 ---------
 2 files changed, 104 deletions(-)
 delete mode 100644 common/openecomp-logging-lib/openecomp-logging-api/src/test/java/org/openecomp/core/logging/api/LoggerFactoryTest.java
 delete mode 100644 common/openecomp-logging-lib/openecomp-logging-api/src/test/java/org/openecomp/core/logging/api/context/TaskFactoryTest.java

(limited to 'common/openecomp-logging-lib/openecomp-logging-api/src/test/java')

diff --git a/common/openecomp-logging-lib/openecomp-logging-api/src/test/java/org/openecomp/core/logging/api/LoggerFactoryTest.java b/common/openecomp-logging-lib/openecomp-logging-api/src/test/java/org/openecomp/core/logging/api/LoggerFactoryTest.java
deleted file mode 100644
index 7158db7ab4..0000000000
--- a/common/openecomp-logging-lib/openecomp-logging-api/src/test/java/org/openecomp/core/logging/api/LoggerFactoryTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T 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.
- * 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.openecomp.core.logging.api;
-
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Field;
-import java.util.ServiceLoader;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-
-/**
- * @author evitaliy
- * @since 14/09/2016.
- */
-public class LoggerFactoryTest {
-
-  @Test
-  public void testNoOpLoggerService() throws Exception {
-
-    assertFalse(ServiceLoader.load(LoggerCreationService.class).iterator().hasNext());
-
-    LoggerFactory.getLogger(LoggerFactoryTest.class);
-    Field factory = LoggerFactory.class.getDeclaredField("SERVICE");
-    factory.setAccessible(true);
-    Object impl = factory.get(null);
-    assertEquals("org.openecomp.core.logging.api.LoggerFactory$NoOpLoggerCreationService",
-        impl.getClass().getName());
-  }
-
-  @Test
-  public void testNoOpLoggerByClass() throws Exception {
-    Logger logger = LoggerFactory.getLogger(LoggerFactoryTest.class);
-    verifyLogger(logger);
-  }
-
-  @Test
-  public void testNoOpLoggerByName() throws Exception {
-    Logger logger = LoggerFactory.getLogger(LoggerFactoryTest.class.getName());
-    verifyLogger(logger);
-  }
-
-  private void verifyLogger(Logger logger) {
-    assertNotNull(logger);
-
-    // make sure no exceptions are thrown
-    logger.error("");
-    logger.warn("");
-    logger.info("");
-    logger.debug("");
-    logger.audit("");
-    logger.metrics("");
-  }
-}
diff --git a/common/openecomp-logging-lib/openecomp-logging-api/src/test/java/org/openecomp/core/logging/api/context/TaskFactoryTest.java b/common/openecomp-logging-lib/openecomp-logging-api/src/test/java/org/openecomp/core/logging/api/context/TaskFactoryTest.java
deleted file mode 100644
index 111a30de1a..0000000000
--- a/common/openecomp-logging-lib/openecomp-logging-api/src/test/java/org/openecomp/core/logging/api/context/TaskFactoryTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.openecomp.core.logging.api.context;
-
-import org.testng.annotations.Test;
-
-import java.util.ServiceLoader;
-
-import static org.testng.Assert.*;
-
-/**
- * @author evitaliy
- * @since 14/09/2016.
- */
-public class TaskFactoryTest {
-
-  @Test(expectedExceptions = RuntimeException.class)
-  public void testNoImplementation() throws Exception {
-
-    assertFalse(ServiceLoader.load(ContextPropagationService.class).iterator().hasNext());
-
-    try {
-      TaskFactory.create(() -> {
-      });
-    } catch (RuntimeException e) {
-      Throwable cause = e.getCause();
-      assertNotNull(cause);
-      assertTrue(cause.getMessage().contains(ContextPropagationService.class.getName()));
-      throw e;
-    }
-  }
-}
\ No newline at end of file
-- 
cgit 1.2.3-korg