adding additional coverage + some minor fixes

harness · Aug 14, 2023 · 49c76e9 · 49c76e9
1 parent c9a2e25
commit 49c76e9
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 7 deletions.
diff --git a/src/main/java/io/harness/cf/client/common/SdkCodes.java b/src/main/java/io/harness/cf/client/common/SdkCodes.java
@@ -38,31 +38,31 @@ public static void infoStreamConnected() {
   }
 
   public static void infoStreamEventReceived(String eventJson) {
-    log.info(sdkErrMsg(5002, of(eventJson)));
+    log.info(sdkErrMsg(5002, ofNullable(eventJson)));
   }
 
   public static void infoMetricsThreadStarted(int intervalSec) {
     log.info(sdkErrMsg(7000, of(valueOf(intervalSec * 1000))));
   }
 
   public static void infoMetricsThreadExited() {
-    log.info(sdkErrMsg(7000));
+    log.info(sdkErrMsg(7001));
   }
 
   public static void warnAuthFailedSrvDefaults(String reason) {
-    log.warn(sdkErrMsg(2001, Optional.of(reason)));
+    log.warn(sdkErrMsg(2001, Optional.ofNullable(reason)));
   }
 
   public static void warnAuthRetying(int attempt) {
     log.warn(sdkErrMsg(2003, Optional.of(", attempt " + attempt)));
   }
 
   public static void warnStreamDisconnected(String reason) {
-    log.warn(sdkErrMsg(5001, Optional.of(reason)));
+    log.warn(sdkErrMsg(5001, Optional.ofNullable(reason)));
   }
 
   public static void warnPostMetricsFailed(String reason) {
-    log.warn(sdkErrMsg(7002, Optional.of(reason)));
+    log.warn(sdkErrMsg(7002, Optional.ofNullable(reason)));
   }
 
   public static void warnDefaultVariationServed(String identifier, Target target, String def) {
@@ -94,13 +94,13 @@ public static void warnDefaultVariationServed(String identifier, Target target,
                 // SDK_STREAM_5xxx
                 {"5000", "SSE stream connected ok"},
                 {"5001", "SSE stream disconnected, reason:"},
-                {"5002", "SSE event received: "},
+                {"5002", "SSE event received:"},
                 {"5003", "SSE retrying to connect in"},
                 // SDK_EVAL_6xxx
                 {"6000", "Evaluated variation successfully"},
                 {"6001", "Default variation was served"},
                 // SDK_METRICS_7xxx
-                {"7000", "Metrics thread started, intervalMs: "},
+                {"7000", "Metrics thread started, intervalMs:"},
                 {"7001", "Metrics thread exited"},
                 {"7002", "Posting metrics failed, reason:"}
               })

diff --git a/src/test/java/io/harness/cf/client/common/SdkCodesTest.java b/src/test/java/io/harness/cf/client/common/SdkCodesTest.java
@@ -0,0 +1,40 @@
+package io.harness.cf.client.common;
+
+import static io.harness.cf.client.common.SdkCodes.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import io.harness.cf.client.dto.Target;
+import org.junit.jupiter.api.Test;
+
+class SdkCodesTest {
+
+  @Test
+  void testAllLogs() {
+    assertDoesNotThrow(
+        () -> {
+          errorMissingSdkKey();
+          infoPollStarted(123);
+          infoSdkInitOk();
+          infoSdkAuthOk();
+          infoPollingStopped();
+          infoStreamConnected();
+          infoStreamEventReceived(null);
+          infoStreamEventReceived("dummy data");
+          infoMetricsThreadStarted(321);
+          infoMetricsThreadExited();
+          warnAuthFailedSrvDefaults(null);
+          warnAuthFailedSrvDefaults("error 1");
+          warnAuthRetying(1);
+          warnAuthRetying(-1);
+          warnStreamDisconnected("error 2");
+          warnStreamDisconnected(null);
+          warnPostMetricsFailed(null);
+          warnPostMetricsFailed("error 3");
+          warnDefaultVariationServed("id1", null, null);
+          warnDefaultVariationServed("id1", null, "defaultVal");
+
+          Target target = Target.builder().identifier("test").isPrivate(false).build();
+          warnDefaultVariationServed("id2", target, "defaultVal2");
+        });
+  }
+}