From 6eceb46537df31756446760484ad1925a997205a Mon Sep 17 00:00:00 2001
From: vempo <vitaliy.emporopulo@amdocs.com>
Date: Fri, 23 Mar 2018 23:10:30 +0300
Subject: Logging refactoring and global context

Implemented global context (instance ID, host address).
Refactored the logging context API for clarity and
separation of concerns. Added unit tests. Fixed Javadoc.

Change-Id: I6e29b7b3613aebf23112dc017490ad2828e0fb91
Issue-ID: SDC-772
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
---
 .../openecomp/sdc/logging/api/ContextDataTest.java | 54 ++++++++++++++++++++++
 .../sdc/logging/api/LoggingContextTest.java        | 18 ++------
 2 files changed, 59 insertions(+), 13 deletions(-)
 create mode 100644 openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/ContextDataTest.java

(limited to 'openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test')

diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/ContextDataTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/ContextDataTest.java
new file mode 100644
index 0000000000..8a173b452a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/ContextDataTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.openecomp.sdc.logging.api;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
+import org.testng.annotations.Test;
+
+/**
+ * Unit-testing context data builder.
+ *
+ * @author evitaliy
+ * @since 04 Mar 18
+ */
+public class ContextDataTest {
+
+    @Test
+    public void allPropertiesReadWhenPopulated() {
+
+        final String serviceName = "running-service";
+        final String partnerName = "remote-partner";
+        final String requestId = "123412341234";
+
+        ContextData data = ContextData.builder()
+            .serviceName(serviceName).partnerName(partnerName).requestId(requestId).build();
+
+        assertEquals(data.getRequestId(), requestId);
+        assertEquals(data.getServiceName(), serviceName);
+        assertEquals(data.getPartnerName(), partnerName);
+    }
+
+    @Test
+    public void allPropertiesEmptyWhenUnpopulated() {
+        ContextData data = ContextData.builder().build();
+        assertNull(data.getRequestId());
+        assertNull(data.getServiceName());
+        assertNull(data.getPartnerName());
+    }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggingContextTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggingContextTest.java
index bfc53a3146..3e7bbe14e0 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggingContextTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggingContextTest.java
@@ -24,7 +24,9 @@ import java.util.concurrent.Callable;
 import org.testng.annotations.Test;
 
 /**
- * @author EVITALIY
+ * Unit-testing default context service implementation.
+ *
+ * @author evitaliy
  * @since 08 Jan 18
  */
 public class LoggingContextTest {
@@ -39,18 +41,8 @@ public class LoggingContextTest {
     }
 
     @Test(expectedExceptions = NullPointerException.class)
-    public void throwNpeWhenPartnerNameIsNull() {
-        LoggingContext.putPartnerName(null);
-    }
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void throwNpeWhenServiceNameIsNull() {
-        LoggingContext.putServiceName(null);
-    }
-
-    @Test(expectedExceptions = NullPointerException.class)
-    public void throwNpeWhenRequestIdIsNull() {
-        LoggingContext.putRequestId(null);
+    public void throwNpeWhenContextIsNull() {
+        LoggingContext.put(null);
     }
 
     @Test
-- 
cgit 1.2.3-korg